Changeset 55611 in vbox

Timestamp:

May 3, 2015 1:31:34 AM (9 years ago)

Author:

vboxsync

Message:

Main: Merged the VFSFileType and FsObjType enums, keeping the 'FsObjType' name while picking the values and most of the names from VFSFileType (because they make more sense to someone who came up with the RTFS_TYPE_XXX and RTDIRENTRYTYPE_XXX bits). VFSFileType used 'SymLink', that's not 'Symlink' in keeping with the rest of the API and IPRT.

Location:

trunk/src/VBox/Main

Files:

• idl/VirtualBox.xidl (modified) (5 diffs)
• include/VFSExplorerImpl.h (modified) (1 diff)
• src-client/GuestCtrlPrivate.cpp (modified) (2 diffs)
• src-server/VFSExplorerImpl.cpp (modified) (6 diffs)

trunk/src/VBox/Main/idl/VirtualBox.xidl

@@ -2813 +2813 @@
   </enum>
 
-  <enum
-    name="VFSFileType"
-    uuid="714333cd-44e2-415f-a245-d378fa9b1242"
-    >
-    <desc>
-      File types known by VFSExplorer.
-    </desc>
-
-    <const name="Unknown" value="1" />
-    <const name="Fifo" value="2" />
-    <const name="DevChar" value="3" />
-    <const name="Directory" value="4" />
-    <const name="DevBlock" value="5" />
-    <const name="File" value="6" />
-    <const name="SymLink" value="7" />
-    <const name="Socket" value="8" />
-    <const name="WhiteOut" value="9" />
-  </enum>
-
   <interface
     name="IVFSExplorer" extends="$unknown"
@@ -2892 +2873 @@
 
       <param name="types" type="unsigned long" safearray="yes" dir="out">
-        <desc>The list of types for the entries.</desc>
+        <desc>The list of types for the entries <link to="FSObjType"/>.</desc>
       </param>
 
@@ -10419 +10400 @@
   <enum
     name="FsObjType"
-    uuid="a1ed437c-b3c3-4ca2-b19c-4239d658d5e8"
+    uuid="34a0d1aa-491e-e209-e150-84964d6cee5f"
     >
     <desc>
-      File system object type.
-    </desc>
-
-    <const name="Undefined"             value="0">
-      <desc>Type is undefined / unknown.</desc>
-    </const>
-    <const name="FIFO"                  value="1">
-      <desc>Named pipe.</desc>
-    </const>
-    <const name="DevChar"               value="10">
+      File system object (file) types.
+    </desc>
+    <const name="Unknown"   value="1">
+      <desc>Used either if the object has type that is not in this enum, or
+        if the type has not yet been determined or set.</desc>
+    </const>
+    <const name="Fifo"      value="2">
+      <desc>FIFO or named pipe, depending on the platform/terminology.</desc>
+    </const>
+    <const name="DevChar"   value="3">
       <desc>Character device.</desc>
     </const>
-    <const name="DevBlock"              value="11">
+    <const name="Directory" value="4">
+      <desc>Directory.</desc>
+    </const>
+    <const name="DevBlock"  value="5">
       <desc>Block device.</desc>
     </const>
-    <const name="Directory"             value="50">
-      <desc>Directory.</desc>
-    </const>
-    <const name="File"                  value="80">
-      <desc>File.</desc>
-    </const>
-    <const name="Symlink"               value="100">
-      <desc>Symlink.</desc>
-    </const>
-    <const name="Socket"                value="200">
+    <const name="File"      value="6">
+      <desc>Regular file.</desc>
+    </const>
+    <const name="Symlink"   value="7">
+      <desc>Symbolic link.</desc>
+    </const>
+    <const name="Socket"    value="8">
       <desc>Socket.</desc>
     </const>
-    <const name="Whiteout"              value="400">
-      <desc>Whiteout.</desc>
+    <const name="WhiteOut"  value="9">
+      <desc>A white-out file.  Found in union mounts where it is used for
+        hiding files after deletion, I think. </desc>
     </const>
   </enum>
@@ -12257 +12239 @@
   <interface
     name="IFsObjInfo" extends="$unknown"
-    uuid="4047ba30-7006-4966-ae86-94164e5e20eb"
+    uuid="37b30bc6-4506-58e4-bc43-fbbca92b4548"
     wsmap="managed"
     >
@@ -12367 +12349 @@
   <interface
     name="IGuestFsObjInfo" extends="IFsObjInfo"
-    uuid="7cf2d77d-4222-8e33-1065-cab345173300"
+    uuid="6620db85-44e0-ca69-e9e0-d4907ceccbe5"
     wsmap="managed"
     >

trunk/src/VBox/Main/include/VFSExplorerImpl.h

@@ -77 +77 @@
 
     /* Private member methods */
-    VFSFileType_T i_RTToVFSFileType(int aType) const;
+    FsObjType_T i_iprtToVfsObjType(RTFMODE aType) const;
 
     HRESULT i_updateFS(TaskVFSExplorer *aTask);

trunk/src/VBox/Main/src-client/GuestCtrlPrivate.cpp

@@ -60 +60 @@
         /** @todo Add more types! */
         else
-            mType = FsObjType_Undefined;
+            mType = FsObjType_Unknown;
         /* Object size. */
         rc = strmBlk.GetInt64Ex("st_size", &mObjectSize);
@@ -126 +126 @@
         /** @todo Add more types! */
         else
-            mType = FsObjType_Undefined;
+            mType = FsObjType_Unknown;
         /* Object size. */
         rc = strmBlk.GetInt64Ex("st_size", &mObjectSize);

trunk/src/VBox/Main/src-server/VFSExplorerImpl.cpp

@@ -41 +41 @@
     struct DirEntry
     {
-        DirEntry(Utf8Str strName, VFSFileType_T fileType, uint64_t cbSize, uint32_t fMode)
+        DirEntry(Utf8Str strName, FsObjType_T fileType, uint64_t cbSize, uint32_t fMode)
            : name(strName)
            , type(fileType)
@@ -48 +48 @@
 
         Utf8Str name;
-        VFSFileType_T type;
+        FsObjType_T type;
         uint64_t size;
         uint32_t mode;
@@ -258 +258 @@
 }
 
-VFSFileType_T VFSExplorer::i_RTToVFSFileType(int aType) const
+FsObjType_T VFSExplorer::i_iprtToVfsObjType(RTFMODE aType) const
 {
     int a = aType & RTFS_TYPE_MASK;
-    VFSFileType_T t = VFSFileType_Unknown;
+    FsObjType_T t = FsObjType_Unknown;
     if ((a & RTFS_TYPE_DIRECTORY) == RTFS_TYPE_DIRECTORY)
-        t = VFSFileType_Directory;
+        t = FsObjType_Directory;
     else if ((a & RTFS_TYPE_FILE) == RTFS_TYPE_FILE)
-        t = VFSFileType_File;
+        t = FsObjType_File;
     else if ((a & RTFS_TYPE_SYMLINK) == RTFS_TYPE_SYMLINK)
-        t = VFSFileType_SymLink;
+        t = FsObjType_Symlink;
     else if ((a & RTFS_TYPE_FIFO) == RTFS_TYPE_FIFO)
-        t = VFSFileType_Fifo;
+        t = FsObjType_Fifo;
     else if ((a & RTFS_TYPE_DEV_CHAR) == RTFS_TYPE_DEV_CHAR)
-        t = VFSFileType_DevChar;
+        t = FsObjType_DevChar;
     else if ((a & RTFS_TYPE_DEV_BLOCK) == RTFS_TYPE_DEV_BLOCK)
-        t = VFSFileType_DevBlock;
+        t = FsObjType_DevBlock;
     else if ((a & RTFS_TYPE_SOCKET) == RTFS_TYPE_SOCKET)
-        t = VFSFileType_Socket;
+        t = FsObjType_Socket;
     else if ((a & RTFS_TYPE_WHITEOUT) == RTFS_TYPE_WHITEOUT)
-        t = VFSFileType_WhiteOut;
+        t = FsObjType_WhiteOut;
 
     return t;
@@ -313 +313 @@
                 if (   name != "."
                     && name != "..")
-                    fileList.push_back(VFSExplorer::Data::DirEntry(name, i_RTToVFSFileType(entry.Info.Attr.fMode),
+                    fileList.push_back(VFSExplorer::Data::DirEntry(name, i_iprtToVfsObjType(entry.Info.Attr.fMode),
                                        entry.Info.cbObject,
                                        entry.Info.Attr.fMode & (RTFS_UNIX_IRWXU | RTFS_UNIX_IRWXG | RTFS_UNIX_IRWXO)));
@@ -431 +431 @@
             {
                 /* Set always read/write permissions of the current logged in user. */
-                fileList.push_back(VFSExplorer::Data::DirEntry(pBuckets->pszName, VFSFileType_Directory,
+                fileList.push_back(VFSExplorer::Data::DirEntry(pBuckets->pszName, FsObjType_Directory,
                                    0, RTFS_UNIX_IRUSR | RTFS_UNIX_IWUSR));
                 pBuckets = pBuckets->pNext;
@@ -449 +449 @@
                 Utf8Str name(pKeys->pszName);
                 /* Set always read/write permissions of the current logged in user. */
-                fileList.push_back(VFSExplorer::Data::DirEntry(pKeys->pszName, VFSFileType_File, pKeys->cbFile,
+                fileList.push_back(VFSExplorer::Data::DirEntry(pKeys->pszName, FsObjType_File, pKeys->cbFile,
                                    RTFS_UNIX_IRUSR | RTFS_UNIX_IWUSR));
                 pKeys = pKeys->pNext;