From d66b72864c74bfea4cde6d9713708afa4e40a346 Mon Sep 17 00:00:00 2001 From: Miklos Szeredi Date: Thu, 2 Feb 2006 15:15:21 +0000 Subject: [PATCH] merge fuse_2_5_bugfix --- ChangeLog | 3 +++ lib/mount_bsd.c | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index edbae5a..852001d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -10,6 +10,9 @@ 2006-01-20 Miklos Szeredi + * Sanitize storage type and help message in mount_bsd.c. Patch + from Csaba Henk + * fuse_opt: add new helper constants FUSE_OPT_KEY_KEEP and FUSE_OPT_KEY_DISCARD diff --git a/lib/mount_bsd.c b/lib/mount_bsd.c index b0f2e35..cb1b2b9 100644 --- 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; -- 2.30.2