fix

diff --git a/ChangeLog b/ChangeLog
index 89fe3860111d58890cc8e47af7b44586fd185f2f..85a9382b0bbb4f79044f15783f9629fbd242c365 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,9 @@
        * fuse_opt: add new helper constants FUSE_OPT_KEY_KEEP and
        FUSE_OPT_KEY_DISCARD
 
+       * Sanitize storage type and help message in mount_bsd.c.  Patch
+       from Csaba Henk
+
 2006-01-19  Miklos Szeredi <miklos@szeredi.hu>
 
        * lib: if "fsname=" option was given, pass it to fusermount

diff --git a/lib/mount_bsd.c b/lib/mount_bsd.c
index b0f2e357931b34dc3317a632ac468233f7d11e61..cb1b2b9fae19d7bf71095de36c785cb2d5427be1 100644 (file)
--- a/lib/mount_bsd.c
+++ b/lib/mount_bsd.c
@@ -161,6 +161,7 @@ void fuse_unmount(const char *mountpoint)
     FILE *sf;
     int rv;
     char *seekscript =
+    "exec 2>/dev/null; " /* error message is annoying in help output */
     "/usr/bin/fstat " FUSE_DEV_TRUNK "* | "
     "/usr/bin/awk 'BEGIN{ getline; if (! ($3 == \"PID\" && $10 == \"NAME\")) exit 1; }; "
     "              { if ($3 == %d) print $10; }' | "
@@ -186,7 +187,7 @@ void fuse_unmount(const char *mountpoint)
     system(umount_cmd);
 }
 
-int fuse_mount_core(const char *mountpoint, const char *opts)
+static int fuse_mount_core(const char *mountpoint, const char *opts)
 {
     const char *mountprog = FUSERMOUNT_PROG;
     int fd;