Changeset 69674 in vbox for trunk/src/VBox/Runtime/r3

Timestamp:

Nov 13, 2017 3:29:43 PM (7 years ago)

Author:

vboxsync

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

119042

Message:

iprt: A bunch of basic function for working the file system relative to an open directory. There is only a default implementation currently, the path race conditions will first be eliminated/reduced with platform specific implementations (POSIX, NT). Also added a VFS wrapper around RTDIR handles, completing RTVfsChainOpenDir and making RTLs work on normal directories too (instead of only isofs and fat).

Location:

trunk/src/VBox/Runtime/r3

Files:

• dir.cpp (modified) (6 diffs)
• generic/dirrel-r3-generic.cpp (added)

trunk/src/VBox/Runtime/r3/dir.cpp

@@ -510 +510 @@
  * @param   pszFilter   Pointer to where the filter start in the path. NULL if no filter.
  * @param   enmFilter   The type of filter to apply.
- */
-static int rtDirOpenCommon(PRTDIR *ppDir, const char *pszPath, const char *pszFilter, RTDIRFILTER enmFilter)
+ * @param   fFlags      RTDIR_F_XXX.
+ */
+static int rtDirOpenCommon(PRTDIR *ppDir, const char *pszPath, const char *pszFilter, RTDIRFILTER enmFilter, uint32_t fFlags)
 {
     /*
@@ -614 +615 @@
     pDir->pszPath = (char *)memcpy(pb, szRealPath, cchRealPath + 1);
     Assert(pb - (uint8_t *)pDir + cchRealPath + 1 <= cbAllocated);
-    pDir->fDataUnread = false;
     pDir->pszName = NULL;
     pDir->cchName = 0;
+    pDir->fFlags  = fFlags;
+    pDir->fDataUnread = false;
 
     /*
@@ -643 +645 @@
      * Take common cause with RTDirOpenFiltered().
      */
-    int rc = rtDirOpenCommon(ppDir, pszPath, NULL,  RTDIRFILTER_NONE);
+    int rc = rtDirOpenCommon(ppDir, pszPath, NULL, RTDIRFILTER_NONE, 0 /*fFlags*/);
     LogFlow(("RTDirOpen(%p:{%p}, %p:{%s}): return %Rrc\n", ppDir, *ppDir, pszPath, pszPath, rc));
     return rc;
@@ -649 +651 @@
 
 
-RTDECL(int) RTDirOpenFiltered(PRTDIR *ppDir, const char *pszPath, RTDIRFILTER enmFilter, uint32_t fOpen)
+RTDECL(int) RTDirOpenFiltered(PRTDIR *ppDir, const char *pszPath, RTDIRFILTER enmFilter, uint32_t fFlags)
 {
     /*
@@ -656 +658 @@
     AssertMsgReturn(VALID_PTR(ppDir), ("%p\n", ppDir), VERR_INVALID_POINTER);
     AssertMsgReturn(VALID_PTR(pszPath), ("%p\n", pszPath), VERR_INVALID_POINTER);
-    AssertReturn(!(fOpen & ~RTDIROPEN_FLAGS_NO_SYMLINKS), VERR_INVALID_FLAGS);
+    AssertReturn(!(fFlags & ~RTDIR_F_VALID_MASK), VERR_INVALID_FLAGS);
     switch (enmFilter)
     {
@@ -687 +689 @@
      * and initialize the handle, and finally call the backend.
      */
-    int rc = rtDirOpenCommon(ppDir, pszPath, pszFilter, enmFilter);
-
-    LogFlow(("RTDirOpenFiltered(%p:{%p}, %p:{%s}, %d): return %Rrc\n",
-             ppDir, *ppDir, pszPath, pszPath, enmFilter, rc));
+    int rc = rtDirOpenCommon(ppDir, pszPath, pszFilter, enmFilter, fFlags);
+
+    LogFlow(("RTDirOpenFiltered(%p:{%p}, %p:{%s}, %d, %#x): return %Rrc\n",
+             ppDir, *ppDir, pszPath, pszPath, enmFilter, fFlags, rc));
     return rc;
+}
+
+
+RTDECL(bool) RTDirIsValid(PRTDIR hDir)
+{
+    return RT_VALID_PTR(hDir)
+        && hDir->u32Magic == RTDIR_MAGIC;
 }