Changeset 56675 in vbox for trunk/src/VBox

Timestamp:

Jun 29, 2015 3:37:43 PM (9 years ago)

Author:

vboxsync

Message:

Additions/linux: Implement '-s' sloppy option parsing for shared folders.

Location:

trunk/src/VBox/Additions

Files:

• common/VBoxService/VBoxServiceAutoMount.cpp (modified) (1 diff)
• linux/sharedfolders/mount.vboxsf.c (modified) (5 diffs)
• linux/sharedfolders/vbsfmount.h (modified) (1 diff)

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceAutoMount.cpp

@@ -441 +441 @@
                             0,                     /* fmask */
                             0,                     /* ronly */
+                            0,                     /* sloppy */
                             0,                     /* noexec */
                             0,                     /* nodev */

trunk/src/VBox/Additions/linux/sharedfolders/mount.vboxsf.c

@@ -288 +288 @@
         }
 
-        if (!handler->name)
+        if (   !handler->name
+            && !opts->sloppy)
         {
             fprintf(stderr, "unknown mount option `%.*s'\n", (int)len, s);
@@ -346 +347 @@
            "  -r                    mount the shared folder read-only\n"
            "  -n                    do not create an mtab entry\n"
+           "  -s                    sloppy parsing, ignore unrecognized mount options\n"
            "  -o OPTION[,OPTION...] use the mount options specified\n"
            "\n", name);
@@ -388 +390 @@
         0,     /* fmask */
         0,     /* ronly */
+        0,     /* sloppy */
         0,     /* noexec */
         0,     /* nodev */
@@ -412 +415 @@
     CT_ASSERT(sizeof(gid_t) == sizeof(int));
 
-    while ((c = getopt(argc, argv, "rwno:h")) != -1)
+    while ((c = getopt(argc, argv, "rwsno:h")) != -1)
     {
         switch (c)
@@ -428 +431 @@
             case 'w':
                 opts.ronly = 0;
+
+            case 's':
+                opts.sloppy = 1;
+                break;
 
             case 'o':

trunk/src/VBox/Additions/linux/sharedfolders/vbsfmount.h

@@ -63 +63 @@
     int  fmask;
     int  ronly;
+    int  sloppy;
     int  noexec;
     int  nodev;