Changeset 85218 in vbox for trunk/src/VBox/Main/src-server

Timestamp:

Jul 11, 2020 2:09:04 PM (5 years ago)

Author:

vboxsync

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

139195

Message:

Main/VFSExplorerImpl.cpp: Corrected totally messed up i_iprtToVfsObjType code. Use RTFOFF for the DirEntry size to avoid sign conversion non-sense. bugref:9790

File:

• trunk/src/VBox/Main/src-server/VFSExplorerImpl.cpp (modified) (4 diffs)

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

@@ -42 +42 @@
     struct DirEntry
     {
-        DirEntry(Utf8Str strName, FsObjType_T fileType, uint64_t cbSize, uint32_t fMode)
+        DirEntry(Utf8Str strName, FsObjType_T fileType, RTFOFF cbSize, uint32_t fMode)
            : name(strName)
            , type(fileType)
@@ -50 +50 @@
         Utf8Str name;
         FsObjType_T type;
-        uint64_t size;
+        RTFOFF size;
         uint32_t mode;
     };
@@ -252 +252 @@
 FsObjType_T VFSExplorer::i_iprtToVfsObjType(RTFMODE aType) const
 {
-    int a = aType & RTFS_TYPE_MASK;
-    FsObjType_T t = FsObjType_Unknown;
-    if ((a & RTFS_TYPE_DIRECTORY) == RTFS_TYPE_DIRECTORY)
-        t = FsObjType_Directory;
-    else if ((a & RTFS_TYPE_FILE) == RTFS_TYPE_FILE)
-        t = FsObjType_File;
-    else if ((a & RTFS_TYPE_SYMLINK) == RTFS_TYPE_SYMLINK)
-        t = FsObjType_Symlink;
-    else if ((a & RTFS_TYPE_FIFO) == RTFS_TYPE_FIFO)
-        t = FsObjType_Fifo;
-    else if ((a & RTFS_TYPE_DEV_CHAR) == RTFS_TYPE_DEV_CHAR)
-        t = FsObjType_DevChar;
-    else if ((a & RTFS_TYPE_DEV_BLOCK) == RTFS_TYPE_DEV_BLOCK)
-        t = FsObjType_DevBlock;
-    else if ((a & RTFS_TYPE_SOCKET) == RTFS_TYPE_SOCKET)
-        t = FsObjType_Socket;
-    else if ((a & RTFS_TYPE_WHITEOUT) == RTFS_TYPE_WHITEOUT)
-        t = FsObjType_WhiteOut;
-
-    return t;
+    switch (aType & RTFS_TYPE_MASK)
+    {
+        case RTFS_TYPE_DIRECTORY:   return FsObjType_Directory;
+        case RTFS_TYPE_FILE:        return FsObjType_File;
+        case RTFS_TYPE_SYMLINK:     return FsObjType_Symlink;
+        case RTFS_TYPE_FIFO:        return FsObjType_Fifo;
+        case RTFS_TYPE_DEV_CHAR:    return FsObjType_DevChar;
+        case RTFS_TYPE_DEV_BLOCK:   return FsObjType_DevBlock;
+        case RTFS_TYPE_SOCKET:      return FsObjType_Socket;
+        case RTFS_TYPE_WHITEOUT:    return FsObjType_WhiteOut;
+        default:                    return FsObjType_Unknown;
+    }
 }
 
@@ -304 +296 @@
                         && name != "..")
                         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)));
+                                                                       entry.Info.cbObject,
+                                                                         entry.Info.Attr.fMode
+                                                                       & (RTFS_UNIX_IRWXU | RTFS_UNIX_IRWXG | RTFS_UNIX_IRWXO)));
                 }
             }