Changeset 69816 in vbox for trunk/src/VBox/Runtime

Timestamp:

Nov 23, 2017 6:54:20 PM (7 years ago)

Author:

vboxsync

Message:

build fix

File:

• trunk/src/VBox/Runtime/common/vfs/vfsbase.cpp (modified) (2 diffs)

trunk/src/VBox/Runtime/common/vfs/vfsbase.cpp

@@ -2688 +2688 @@
     if (RT_SUCCESS(rc))
     {
+        if (   pPath->fDirSlash
+            || pPath->cComponents == 0)
+            fObjFlags &= ~RTVFSOBJ_F_OPEN_ANY | RTVFSOBJ_F_OPEN_DIRECTORY;
+
         if (pPath->cComponents > 0)
         {
@@ -2706 +2710 @@
                 if (pPath->fDirSlash)
                 {
-                    RTVFSDIR hVfsDir;
+                    RTVFSDIR hVfsSubDir;
                     RTVfsLockAcquireWrite(pVfsParentDir->Base.hLock);
-                    rc = pVfsParentDir->pOps->pfnOpenDir(pVfsParentDir->Base.pvThis, pszEntryName, 0 /** @todo fFlags*/, &hVfsDir);
+                    rc = pVfsParentDir->pOps->pfnOpenDir(pVfsParentDir->Base.pvThis, pszEntryName,
+                                                         0 /** @todo fFlags*/, &hVfsSubDir);
                     RTVfsLockReleaseWrite(pVfsParentDir->Base.hLock);
                     if (RT_SUCCESS(rc))
                     {
-                        *phVfsObj = RTVfsObjFromDir(hVfsDir);
-                        RTVfsDirRelease(hVfsDir);
+                        *phVfsObj = RTVfsObjFromDir(hVfsSubDir);
+                        RTVfsDirRelease(hVfsSubDir);
                         AssertStmt(*phVfsObj != NIL_RTVFSOBJ, rc = VERR_INTERNAL_ERROR_3);
                     }