Changeset 39062 in vbox

Timestamp:

Oct 20, 2011 4:14:11 PM (13 years ago)

Author:

vboxsync

Message:

Additions/solaris/SharedFolders: implemented dmode, fmode, dmask and fmask parameters. (untested)

Location:

trunk/src/VBox/Additions/solaris/SharedFolders

Files:

• vboxfs_vfs.c (modified) (4 diffs)
• vboxfs_vfs.h (modified) (1 diff)
• vboxfs_vnode.c (modified) (2 diffs)

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

@@ -239 +239 @@
         uid_t uid = 0;
         gid_t gid = 0;
+        mode_t dmode = ~0;
+        mode_t fmode = ~0;
+        mode_t dmask = 0;
+        mode_t fmask = 0;
         int stat_ttl = DEF_STAT_TTL_MS;
         int fsync = 0;
@@ -303 +307 @@
 
         /*
+         * dmode to use for all directories
+         */
+        if (vfs_optionisset(vfsp, "dmode", &optval) &&
+                ddi_strtol(optval, NULL, 10, &val) == 0 &&
+                (mode_t)val == val)
+                dmode = val;
+
+        /*
+         * fmode to use for all files
+         */
+        if (vfs_optionisset(vfsp, "fmode", &optval) &&
+                ddi_strtol(optval, NULL, 10, &val) == 0 &&
+                (mode_t)val == val)
+                fmode = val;
+
+        /*
+         * dmask to use for all directories
+         */
+        if (vfs_optionisset(vfsp, "dmask", &optval) &&
+                ddi_strtol(optval, NULL, 10, &val) == 0 &&
+                (mode_t)val == val)
+                dmask = val;
+
+        /*
+         * fmask to use for all files
+         */
+        if (vfs_optionisset(vfsp, "fmask", &optval) &&
+                ddi_strtol(optval, NULL, 10, &val) == 0 &&
+                (mode_t)val == val)
+                fmask = val;
+
+        /*
          * ttl to use for stat caches
          */
@@ -367 +403 @@
         sffs->sf_uid = uid;
         sffs->sf_gid = gid;
+        sffs->sf_dmode = dmode;
+        sffs->sf_fmode = fmode;
+        sffs->sf_dmask = dmask;
+        sffs->sf_fmask = fmask;
         sffs->sf_stat_ttl = stat_ttl;
         sffs->sf_fsync = fsync;
@@ -515 +555 @@
         Log(("    uid_t sf_uid = 0x%l\n", (ulong_t)sffs->sf_uid));
         Log(("    gid_t sf_gid = 0x%l\n", (ulong_t)sffs->sf_gid));
+        Log(("    mode_t sf_dmode = 0x%l\n", (ulong_t)sffs->sf_dmode));
+        Log(("    mode_t sf_fmode = 0x%l\n", (ulong_t)sffs->sf_fmode));
+        Log(("    mode_t sf_dmask = 0x%l\n", (ulong_t)sffs->sf_dmask));
+        Log(("    mode_t sf_fmask = 0x%l\n", (ulong_t)sffs->sf_fmask));
         Log(("    char *sf_share_name = %s\n", sffs->sf_share_name));
         Log(("    char *sf_mntpath = %s\n", sffs->sf_mntpath));

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

@@ -40 +40 @@
         uid_t           sf_uid;         /* owner of all shared folders */
         gid_t           sf_gid;         /* group of all shared folders */
+        mode_t      sf_dmode;   /* mode of all directories */
+        mode_t      sf_fmode;   /* mode of all files */
+        mode_t      sf_dmask;   /* mask of all directories */
+        mode_t      sf_fmask;   /* mask of all files */
         int             sf_stat_ttl;    /* ttl for stat caches (in ms) */
         int             sf_fsync;       /* whether to honor fsync or not */

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

@@ -858 +858 @@
         vap->va_mode = mode & MODEMASK;
         if (S_ISDIR(mode))
+        {
                 vap->va_type = VDIR;
+                vap->va_mode = sffs->sf_dmode != ~0 ? (sffs->sf_dmode & 0777) : vap->va_mode;
+                vap->va_mode &= ~sffs->sf_dmask;
+                vap->va_mode |= S_IFDIR;
+        }
         else if (S_ISREG(mode))
+        {
                 vap->va_type = VREG;
+                vap->va_mode = sffs->sf_fmask != ~0 ? (sffs->sf_fmode & 0777) : vap->va_mode;
+                vap->va_mode &= ~sffs->sf_fmask;
+                vap->va_mode |= S_IFREG;
+        }
         else if (S_ISFIFO(mode))
                 vap->va_type = VFIFO;
@@ -868 +878 @@
                 vap->va_type = VBLK;
         else if (S_ISLNK(mode))
+        {
                 vap->va_type = VLNK;
+                vap->va_mode = sffs->sf_fmask != ~0 ? (sffs->sf_fmode & 0777) : vap->va_mode;
+                vap->va_mode &= ~sffs->sf_fmask;
+                vap->va_mode |= S_IFLNK;
+        }
         else if (S_ISSOCK(mode))
                 vap->va_type = VSOCK;