Changeset 80519 in vbox for trunk/src/VBox/ImageMounter/vboximg-mount

Timestamp:

Aug 30, 2019 5:25:50 PM (5 years ago)

Author:

vboxsync

Message:

vboximg-mount: Fixes, use RTVfsDirRewind to reset the directory handle to the beginning before reading the entries

File:

• trunk/src/VBox/ImageMounter/vboximg-mount/vboximg-mount.cpp (modified) (4 diffs)

trunk/src/VBox/ImageMounter/vboximg-mount/vboximg-mount.cpp

@@ -24 +24 @@
 
 #define FUSE_USE_VERSION 27
-#if defined(RT_OS_DARWIN) || defined(RT_OS_LINUX) || defined(RT_OS_FEEBSD)
+#if defined(RT_OS_DARWIN) || defined(RT_OS_LINUX) || defined(RT_OS_FREEBSD)
 #   define UNIX_DERIVATIVE
 #endif
@@ -316 +316 @@
                 /* Retrieve the accessed volume and return the stat data. */
                 uint32_t idxVol;
-                int rcIprt = RTStrToUInt32Full(&pPathSplit->apszComps[1][5], 10, &idxVol);
+                int rcIprt = RTStrToUInt32Full(&pPathSplit->apszComps[1][2], 10, &idxVol);
                 if (   rcIprt == VINF_SUCCESS
                     && idxVol < g_cVolumes
@@ -669 +669 @@
                     RTDIRENTRYEX DirEntry;
 
+                    rcIprt = RTVfsDirRewind(hVfsDir); AssertRC(rcIprt);
                     rcIprt = RTVfsDirReadEx(hVfsDir, &DirEntry, NULL, RTFSOBJATTRADD_NOTHING);
                     while (RT_SUCCESS(rcIprt))
@@ -675 +676 @@
                         rcIprt = RTVfsDirReadEx(hVfsDir, &DirEntry, NULL, RTFSOBJATTRADD_NOTHING);
                     }
+
                     RTVfsDirRelease(hVfsDir);
                     break;