Fix option escaping for fusermount.

If the "fsname=" option contained a comma then the option parser in
fusermount was confused (Novell bugzilla #641480).  Fix by escaping
commas when passing them over to fusermount.

Reported by Jan Engelhardt

diff --git a/.gitignore b/.gitignore
index c76baf0a66069ba57fc955d39dbcf30248a9816e..65a37c70df28723e890793a165fb61877ec9de98 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -12,6 +12,9 @@
 *.lo
 *.la
 *.gz
+\#*#
+*.orig
+*~
 Makefile.in
 Makefile
 *.m4

diff --git a/ChangeLog b/ChangeLog
index 5c6e74e301e6e128c0476d7acbab5b9869198c70..075a57041cef313a99be100f1cf18a759b7d4b8f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-09-28  Miklos Szeredi <miklos@szeredi.hu>
+
+       * Fix option escaping for fusermount.  If the "fsname=" option
+       contained a comma then the option parser in fusermount was
+       confused (Novell bugzilla #641480).  Fix by escaping commas when
+       passing them over to fusermount.  Reported by Jan Engelhardt
+
 2010-08-27  Miklos Szeredi <miklos@szeredi.hu>
 
        * Add NetBSD support.  Patch from Emmanuel Dreyfus

diff --git a/lib/mount.c b/lib/mount.c
index b525da5c285bca8cd68c876b20d95ddfeda03351..224ae9d5f299e3e497475d24400587f031e41d78 100644 (file)
--- a/lib/mount.c
+++ b/lib/mount.c
@@ -216,7 +216,7 @@ static int fuse_mount_opt_proc(void *data, const char *arg, int key,
                return fuse_opt_add_opt(&mo->kernel_opts, arg);
 
        case KEY_FUSERMOUNT_OPT:
-               return fuse_opt_add_opt(&mo->fusermount_opts, arg);
+               return fuse_opt_add_opt_escaped(&mo->fusermount_opts, arg);
 
        case KEY_SUBTYPE_OPT:
                return fuse_opt_add_opt(&mo->subtype_opt, arg);

diff --git a/util/fusermount.c b/util/fusermount.c
index ae779d3fb21c80dc62510afd5b7f43fd9af0e862..39da9b6a0b6fa1f36d6e1a1a5d28c0fbbe64570f 100644 (file)
--- a/util/fusermount.c
+++ b/util/fusermount.c
@@ -649,7 +649,9 @@ static int opt_eq(const char *s, unsigned len, const char *opt)
 static int get_string_opt(const char *s, unsigned len, const char *opt,
                          char **val)
 {
+       int i;
        unsigned opt_len = strlen(opt);
+       char *d;
 
        if (*val)
                free(*val);
@@ -659,8 +661,15 @@ static int get_string_opt(const char *s, unsigned len, const char *opt,
                return 0;
        }
 
-       memcpy(*val, s + opt_len, len - opt_len);
-       (*val)[len - opt_len] = '\0';
+       d = *val;
+       s += opt_len;
+       len -= opt_len;
+       for (i = 0; i < len; i++) {
+               if (s[i] == '\\' && i + 1 < len)
+                       i++;
+               *d++ = s[i];
+       }
+       *d = '\0';
        return 1;
 }
 
@@ -691,7 +700,12 @@ static int do_mount(const char *mnt, char **typep, mode_t rootmode,
                unsigned len;
                const char *fsname_str = "fsname=";
                const char *subtype_str = "subtype=";
-               for (len = 0; s[len] && s[len] != ','; len++);
+               for (len = 0; s[len]; len++) {
+                       if (s[len] == '\\' && s[len + 1])
+                               len++;
+                       else if (s[len] == ',')
+                               break;
+               }
                if (begins_with(s, fsname_str)) {
                        if (!get_string_opt(s, len, fsname_str, &fsname))
                                goto err;