Changeset 39072 in vbox for trunk/src/VBox/Additions/solaris

Timestamp:

Oct 21, 2011 10:21:11 AM (13 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

74494

Message:

Additions/solaris/SharedFolders: implement umask and interpret as octal.

Location:

trunk/src/VBox/Additions/solaris/SharedFolders

Files:

• vboxfs_mount.c (modified) (1 diff)
• vboxfs_vfs.c (modified) (4 diffs)

trunk/src/VBox/Additions/solaris/SharedFolders/vboxfs_mount.c

@@ -60 +60 @@
            "     ro                 mount read only\n"
            "     uid=UID            set the default file owner user id to UID\n"
-           "     gid=GID            set the default file owner group id to GID\n"
+           "     gid=GID            set the default file owner group id to GID\n");
+    fprintf(stderr,
+           "     dmode=MODE         override the mode for all directories (octal) to MODE\n"
+           "     fmode=MODE         override the mode for all regular files (octal) to MODE\n"
+           "     umask=UMASK        set the umask (bitmask of permissions not present) in (octal) UMASK\n"
+           "     dmask=UMASK        set the umask applied to directories only in (octal) UMASK\n"
+           "     fmask=UMASK        set the umask applied to regular files only in (octal) UMASK\n"
            "     stat_ttl=TTL       set the \"time to live\" (in ms) for the stat caches (default %d)\n", DEF_STAT_TTL_MS);
     fprintf(stderr,

trunk/src/VBox/Additions/solaris/SharedFolders/vboxfs_vfs.c

@@ -310 +310 @@
          */
         if (vfs_optionisset(vfsp, "dmode", &optval) &&
-                ddi_strtol(optval, NULL, 10, &val) == 0 &&
+                ddi_strtol(optval, NULL, 8, &val) == 0 &&
                 (mode_t)val == val)
                 dmode = val;
@@ -318 +318 @@
          */
         if (vfs_optionisset(vfsp, "fmode", &optval) &&
-                ddi_strtol(optval, NULL, 10, &val) == 0 &&
+                ddi_strtol(optval, NULL, 8, &val) == 0 &&
                 (mode_t)val == val)
                 fmode = val;
@@ -326 +326 @@
          */
         if (vfs_optionisset(vfsp, "dmask", &optval) &&
-                ddi_strtol(optval, NULL, 10, &val) == 0 &&
+                ddi_strtol(optval, NULL, 8, &val) == 0 &&
                 (mode_t)val == val)
                 dmask = val;
@@ -334 +334 @@
          */
         if (vfs_optionisset(vfsp, "fmask", &optval) &&
-                ddi_strtol(optval, NULL, 10, &val) == 0 &&
+                ddi_strtol(optval, NULL, 8, &val) == 0 &&
                 (mode_t)val == val)
                 fmask = val;
+
+        /*
+         * umask to use for all directories & files
+         */
+        if (vfs_optionisset(vfsp, "umask", &optval) &&
+                ddi_strtol(optval, NULL, 8, &val) == 0 &&
+                (mode_t)val == val)
+                dmask = fmask = val;
 
         /*