summaryrefslogtreecommitdiff
path: root/sysutils/bbsmount/files
diff options
context:
space:
mode:
Diffstat (limited to 'sysutils/bbsmount/files')
-rw-r--r--sysutils/bbsmount/files/patch-bbsmount.cc78
-rw-r--r--sysutils/bbsmount/files/patch-configure20
-rw-r--r--sysutils/bbsmount/files/patch-data-Makefile.am15
3 files changed, 113 insertions, 0 deletions
diff --git a/sysutils/bbsmount/files/patch-bbsmount.cc b/sysutils/bbsmount/files/patch-bbsmount.cc
new file mode 100644
index 000000000000..fe4f4bd20dd5
--- /dev/null
+++ b/sysutils/bbsmount/files/patch-bbsmount.cc
@@ -0,0 +1,78 @@
+--- bbsmount.cc.orig Thu May 8 16:10:07 2003
++++ bbsmount.cc Sat Oct 11 08:02:39 2003
+@@ -41,6 +41,9 @@
+ #endif /* !TIME_WITH_SYS_TIME */
+
+ #include <pthread.h>
++#include <sys/param.h>
++#include <sys/ucred.h>
++#include <sys/mount.h>
+
+ #include "bbsmount.hh"
+ #include "version.h"
+@@ -128,25 +131,18 @@
+ {
+ set<int> result;
+ map<string, int>::const_iterator pointer;
+- char buffer[max_mtab_line_length], md[max_mount_device_point_size], mp[max_mount_device_point_size];
+- FILE *mtab;
+-
+- mtab = fopen(MTAB_FILE, "rt");
+- if (!mtab) {
+- fprintf(stderr, "Can't open mtab file!");
++ struct statfs *mbuf;
++ int i, size;
++ if((size = getmntinfo(&mbuf, MNT_NOWAIT)) == 0) {
++ fprintf(stderr, "getmntinfo() failed");
+ return result;
++ }
++
++ for(i = 0; i < size; i++) {
++ pointer = mount_points.find(string(mbuf[i].f_mntonname));
++ if (pointer != mount_points.end())
++ result.insert(pointer->second);
+ }
+-
+- while (!feof(mtab)) {
+- if (fgets(buffer, max_mtab_line_length, mtab) > 0) {
+- sscanf(buffer, "%s %s", md, mp);
+- pointer = mount_points.find(string(mp));
+- if (pointer != mount_points.end())
+- result.insert(pointer->second);
+- }
+- }
+-
+- fclose(mtab);
+ return result;
+ }
+
+@@ -179,26 +175,18 @@
+ void *
+ check_mounts(void *param)
+ {
+- struct stat info;
+- int mtab_size = 0, return_value, counter;
+- time_t mtab_time = time(NULL);
++ int return_value, counter;
+ map<string, int> mount_points;
+
+ for (counter = 0; counter < (int)AppWindow->GetMountPointsCount(); counter++)
+ mount_points[AppWindow->GetMountPoint(counter).GetMountPoint()] = counter;
+ while (!finish_checking) {
+- stat(MTAB_FILE, &info);
+- if ((difftime(info.st_mtime, mtab_time) > 0) || (mtab_size != info.st_size)) {
+- mtab_size = info.st_size;
+- mtab_time = info.st_mtime;
+- update_mount_points(mount_points);
+- create_notify_event();
+- }
++ update_mount_points(mount_points);
++ create_notify_event();
+ return_value = sleep(AppWindow->GetResources()->app.refresh_time);
+ if (return_value != 0)
+ finish_checking = true;
+ }
+-
+ pthread_exit(NULL);
+ return NULL;
+ }
diff --git a/sysutils/bbsmount/files/patch-configure b/sysutils/bbsmount/files/patch-configure
new file mode 100644
index 000000000000..3708d21e21f2
--- /dev/null
+++ b/sysutils/bbsmount/files/patch-configure
@@ -0,0 +1,20 @@
+--- configure.orig Mon May 12 04:02:56 2003
++++ configure Sat Oct 11 08:01:12 2003
+@@ -5308,7 +5308,7 @@
+ #include <$ac_header>
+ _ACEOF
+ if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++ (eval $ac_cpp $CFLAGS conftest.$ac_ext) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+@@ -5454,7 +5454,7 @@
+ #include <$ac_header>
+ _ACEOF
+ if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++ (eval $ac_cpp $CFLAGS conftest.$ac_ext) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
diff --git a/sysutils/bbsmount/files/patch-data-Makefile.am b/sysutils/bbsmount/files/patch-data-Makefile.am
new file mode 100644
index 000000000000..32c73843b38b
--- /dev/null
+++ b/sysutils/bbsmount/files/patch-data-Makefile.am
@@ -0,0 +1,15 @@
+--- data/Makefile.am.orig Mon May 12 04:06:36 2003
++++ data/Makefile.am Sat Oct 11 11:30:00 2003
+@@ -1,10 +1,8 @@
+ configdir = $(datadir)/bbtools
+ exampledir = $(pkgdatadir)/examples
+
+-config_DATA = bbsmount.bb \
+- bbsmount.style \
+- bbsmount.nobb \
+- README.bbsmount
++config_DATA = bbsmount.style \
++ bbsmount.nobb
+
+ example_DATA = bbsmount.bb.ex
+