From 9dedb707f43ea1d2e989c41e91e348b1982f06ce Mon Sep 17 00:00:00 2001 From: Miklos Szeredi Date: Tue, 6 Jun 2006 09:48:30 +0000 Subject: [PATCH] fix --- ChangeLog | 10 +++++----- lib/helper.c | 12 +++++++++--- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index d8369ec..05af353 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-06-05 Remy Blank + + * lib: canonicalize mount point in fuse_helper_opt_proc() so that + unmounting succeeds even if mount point was relative. + 2006-06-04 Csaba Henk * lib: fix emergency umount in helper.c when malloc fails. @@ -9,11 +14,6 @@ Switch to "-pthread" from "-lpthread" as that's the preferred one on several platforms. Consulted with Terrence Cole and Miklos Szeredi - - -2006-05-16 Miklos Szeredi - - * Test commit 2006-05-08 Miklos Szeredi diff --git a/lib/helper.c b/lib/helper.c index 7f8ffa5..b6925d4 100644 --- a/lib/helper.c +++ b/lib/helper.c @@ -18,6 +18,7 @@ #include #include #include +#include enum { KEY_HELP, @@ -99,9 +100,14 @@ static int fuse_helper_opt_proc(void *data, const char *arg, int key, return 1; case FUSE_OPT_KEY_NONOPT: - if (!hopts->mountpoint) - return fuse_opt_add_opt(&hopts->mountpoint, arg); - else { + if (!hopts->mountpoint) { + char mountpoint[PATH_MAX]; + if (realpath(arg, mountpoint) == NULL) { + fprintf(stderr, "fuse: bad mount point `%s': %s\n", arg, strerror(errno)); + return -1; + } + return fuse_opt_add_opt(&hopts->mountpoint, mountpoint); + } else { fprintf(stderr, "fuse: invalid argument `%s'\n", arg); return -1; } -- 2.30.2