Changeset 69623 in vbox

Timestamp:

Nov 8, 2017 6:10:47 PM (7 years ago)

Author:

vboxsync

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

118983

Message:

fatvfs.cpp: drop duplicate '.' and '..' entries.

File:

• trunk/src/VBox/Runtime/common/fs/fatvfs.cpp (modified) (2 diffs)

trunk/src/VBox/Runtime/common/fs/fatvfs.cpp

@@ -4021 +4021 @@
 
     /*
-     * Fake '.' and '..' entries.
+     * Fake '.' and '..' entries (required for root, we do it everywhere).
      */
     if (pThis->offDir < 2)
@@ -4048 +4048 @@
         pDirEntry->cbName = pThis->offDir;
         return rc;
+    }
+    if (   pThis->offDir == 2
+        && pShared->cEntries >= 2)
+    {
+        /* Skip '.' and '..' entries if present. */
+        uint32_t            uBufferLock = UINT32_MAX;
+        uint32_t            cEntries    = 0;
+        PCFATDIRENTRYUNION  paEntries   = NULL;
+        int rc = rtFsFatDirShrd_GetEntriesAt(pShared, 0, &paEntries, &cEntries, &uBufferLock);
+        if (RT_FAILURE(rc))
+            return rc;
+        if (   (paEntries[0].Entry.fAttrib & FAT_ATTR_DIRECTORY)
+            && memcmp(paEntries[0].Entry.achName, RT_STR_TUPLE(".          ")) == 0)
+        {
+            if (   (paEntries[1].Entry.fAttrib & FAT_ATTR_DIRECTORY)
+                && memcmp(paEntries[1].Entry.achName, RT_STR_TUPLE("..         ")) == 0)
+                pThis->offDir += sizeof(paEntries[0]) * 2;
+            else
+                pThis->offDir += sizeof(paEntries[0]);
+        }
+        rtFsFatDirShrd_ReleaseBufferAfterReading(pShared, uBufferLock);
     }