Changeset 34002 in vbox for trunk/src/VBox/Runtime/r3

Timestamp:

Nov 11, 2010 5:16:37 PM (14 years ago)

Author:

vboxsync

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

67667

Message:

iprt: Working on tar vfs.

Location:

trunk/src/VBox/Runtime/r3

Files:

• fs.cpp (modified) (3 diffs)
• posix/fileio-posix.cpp (modified) (1 diff)
• posix/path-posix.cpp (modified) (2 diffs)
• win/dir-win.cpp (modified) (1 diff)
• win/fileio-win.cpp (modified) (2 diffs)
• win/path-win.cpp (modified) (2 diffs)

trunk/src/VBox/Runtime/r3/fs.cpp

@@ -37 +37 @@
 #  define DEV_BSIZE S_BLKSIZE /** @todo bird: add DEV_BSIZE to sys/param.h on OS/2. */
 # endif
+# include <grp.h>
+# include <pwd.h>
 #endif
 
@@ -192 +194 @@
 }
 
-
 #ifndef RT_OS_WINDOWS
+
 /**
  * Internal worker function which setups RTFSOBJINFO based on a UNIX stat struct.
@@ -300 +302 @@
     pObjInfo->Attr.u.Unix.Device          = pStat->st_rdev;
 }
+
+
+/**
+ * Set user-owner additional attributes.
+ *
+ * @param   pObjInfo            The object info to fill add attrs for.
+ * @param   uid                 The user id.
+ */
+void    rtFsObjInfoAttrSetUnixOwner(PRTFSOBJINFO pObjInfo, RTUID uid)
+{
+    pObjInfo->Attr.enmAdditional   = RTFSOBJATTRADD_UNIX_OWNER;
+    pObjInfo->Attr.u.UnixOwner.uid = uid;
+    pObjInfo->Attr.u.UnixOwner.szName[0] = '\0';
+
+    char            achBuf[_4K];
+    struct passwd   Pwd;
+    struct passwd  *pPwd;
+    int rc = getpwuid_r(uid, &Pwd, achBuf, sizeof(achBuf), &pPwd);
+    if (!rc && pPwd)
+        RTStrCopy(pObjInfo->Attr.u.UnixOwner.szName, sizeof(pObjInfo->Attr.u.UnixOwner.szName), pPwd->pw_name);
+}
+
+
+/**
+ * Set user-group additional attributes.
+ *
+ * @param   pObjInfo            The object info to fill add attrs for.
+ * @param   gid                 The group id.
+ */
+void rtFsObjInfoAttrSetUnixGroup(PRTFSOBJINFO pObjInfo, RTUID gid)
+{
+    pObjInfo->Attr.enmAdditional   = RTFSOBJATTRADD_UNIX_GROUP;
+    pObjInfo->Attr.u.UnixGroup.gid = gid;
+    pObjInfo->Attr.u.UnixGroup.szName[0] = '\0';
+
+    char            achBuf[_4K];
+    struct group    Grp;
+    struct group   *pGrp;
+
+    int rc = getgrgid_r(gid, &Grp, achBuf, sizeof(achBuf), &pGrp);
+    if (!rc && pGrp)
+        RTStrCopy(pObjInfo->Attr.u.UnixGroup.szName, sizeof(pObjInfo->Attr.u.UnixGroup.szName), pGrp->gr_name);
+}
+
 #endif /* !RT_OS_WINDOWS */
 

trunk/src/VBox/Runtime/r3/posix/fileio-posix.cpp

@@ -658 +658 @@
     switch (enmAdditionalAttribs)
     {
+        case RTFSOBJATTRADD_NOTHING:
+        case RTFSOBJATTRADD_UNIX:
+            /* done */
+            break;
+
+        case RTFSOBJATTRADD_UNIX_OWNER:
+            rtFsObjInfoAttrSetUnixOwner(pObjInfo, Stat.st_uid);
+            break;
+
+        case RTFSOBJATTRADD_UNIX_GROUP:
+            rtFsObjInfoAttrSetUnixGroup(pObjInfo, Stat.st_gid);
+            break;
+
         case RTFSOBJATTRADD_EASIZE:
             pObjInfo->Attr.enmAdditional          = RTFSOBJATTRADD_EASIZE;
             pObjInfo->Attr.u.EASize.cb            = 0;
-            break;
-
-        case RTFSOBJATTRADD_NOTHING:
-        case RTFSOBJATTRADD_UNIX:
-            /* done */
             break;
 

trunk/src/VBox/Runtime/r3/posix/path-posix.cpp

@@ -39 +39 @@
 #include <sys/types.h>
 #include <pwd.h>
+#include <grp.h>
 
 #include <iprt/path.h>
@@ -340 +341 @@
             switch (enmAdditionalAttribs)
             {
+                case RTFSOBJATTRADD_NOTHING:
+                case RTFSOBJATTRADD_UNIX:
+                    Assert(pObjInfo->Attr.enmAdditional == RTFSOBJATTRADD_UNIX);
+                    break;
+
+                case RTFSOBJATTRADD_UNIX_OWNER:
+                    rtFsObjInfoAttrSetUnixOwner(pObjInfo, Stat.st_uid);
+                    break;
+
+                case RTFSOBJATTRADD_UNIX_GROUP:
+                    rtFsObjInfoAttrSetUnixGroup(pObjInfo, Stat.st_gid);
+                    break;
+
                 case RTFSOBJATTRADD_EASIZE:
                     /** @todo Use SGI extended attribute interface to query EA info. */
                     pObjInfo->Attr.enmAdditional          = RTFSOBJATTRADD_EASIZE;
                     pObjInfo->Attr.u.EASize.cb            = 0;
-                    break;
-
-                case RTFSOBJATTRADD_NOTHING:
-                case RTFSOBJATTRADD_UNIX:
-                    Assert(pObjInfo->Attr.enmAdditional == RTFSOBJATTRADD_UNIX);
                     break;
 

trunk/src/VBox/Runtime/r3/win/dir-win.cpp

@@ -437 +437 @@
             break;
 
+        case RTFSOBJATTRADD_UNIX_OWNER:
+            pDirEntry->Info.Attr.enmAdditional          = RTFSOBJATTRADD_UNIX_OWNER;
+            pDirEntry->Info.Attr.u.UnixOwner.uid        = ~0U;
+            pDirEntry->Info.Attr.u.UnixOwner.szName[0]  = '\0'; /** @todo return something sensible here. */
+            break;
+
+        case RTFSOBJATTRADD_UNIX_GROUP:
+            pDirEntry->Info.Attr.enmAdditional          = RTFSOBJATTRADD_UNIX_GROUP;
+            pDirEntry->Info.Attr.u.UnixGroup.gid        = ~0U;
+            pDirEntry->Info.Attr.u.UnixGroup.szName[0]  = '\0';
+            break;
+
         default:
             AssertMsgFailed(("Impossible!\n"));

trunk/src/VBox/Runtime/r3/win/fileio-win.cpp

@@ -680 +680 @@
     switch (enmAdditionalAttribs)
     {
-        case RTFSOBJATTRADD_EASIZE:
-            pObjInfo->Attr.enmAdditional          = RTFSOBJATTRADD_EASIZE;
-            pObjInfo->Attr.u.EASize.cb            = 0;
+        case RTFSOBJATTRADD_NOTHING:
+            pObjInfo->Attr.enmAdditional          = RTFSOBJATTRADD_NOTHING;
             break;
 
@@ -697 +696 @@
             break;
 
-        case RTFSOBJATTRADD_NOTHING:
-            pObjInfo->Attr.enmAdditional          = RTFSOBJATTRADD_NOTHING;
+        case RTFSOBJATTRADD_UNIX_OWNER:
+            pObjInfo->Info.Attr.enmAdditional     = RTFSOBJATTRADD_UNIX_OWNER;
+            pObjInfo->Info.Attr.u.UnixOwner.uid   = ~0U;
+            pObjInfo->Info.Attr.u.UnixOwner.szName[0] = '\0'; /** @todo return something sensible here. */
+            break;
+
+        case RTFSOBJATTRADD_UNIX_GROUP:
+            pObjInfo->Info.Attr.enmAdditional     = RTFSOBJATTRADD_UNIX_GROUP;
+            pObjInfo->Info.Attr.u.UnixGroup.gid   = ~0U;
+            pObjInfo->Info.Attr.u.UnixGroup.szName[0] = '\0';
+            break;
+
+        case RTFSOBJATTRADD_EASIZE:
+            pObjInfo->Attr.enmAdditional          = RTFSOBJATTRADD_EASIZE;
+            pObjInfo->Attr.u.EASize.cb            = 0;
             break;
 

trunk/src/VBox/Runtime/r3/win/path-win.cpp

@@ -300 +300 @@
     switch (enmAdditionalAttribs)
     {
-        case RTFSOBJATTRADD_EASIZE:
-            pObjInfo->Attr.enmAdditional          = RTFSOBJATTRADD_EASIZE;
-            pObjInfo->Attr.u.EASize.cb            = 0;
+        case RTFSOBJATTRADD_NOTHING:
+            pObjInfo->Attr.enmAdditional          = RTFSOBJATTRADD_NOTHING;
             break;
 
@@ -317 +316 @@
             break;
 
-        case RTFSOBJATTRADD_NOTHING:
-            pObjInfo->Attr.enmAdditional          = RTFSOBJATTRADD_NOTHING;
+        case RTFSOBJATTRADD_UNIX_OWNER:
+            pObjInfo->Info.Attr.enmAdditional     = RTFSOBJATTRADD_UNIX_OWNER;
+            pObjInfo->Info.Attr.u.UnixOwner.uid   = ~0U;
+            pObjInfo->Info.Attr.u.UnixOwner.szName[0] = '\0'; /** @todo return something sensible here. */
+            break;
+
+        case RTFSOBJATTRADD_UNIX_GROUP:
+            pObjInfo->Info.Attr.enmAdditional     = RTFSOBJATTRADD_UNIX_GROUP;
+            pObjInfo->Info.Attr.u.UnixGroup.gid   = ~0U;
+            pObjInfo->Info.Attr.u.UnixGroup.szName[0] = '\0';
+            break;
+
+        case RTFSOBJATTRADD_EASIZE:
+            pObjInfo->Attr.enmAdditional          = RTFSOBJATTRADD_EASIZE;
+            pObjInfo->Attr.u.EASize.cb            = 0;
             break;