Changeset 70884 in vbox

Timestamp:

Feb 6, 2018 4:26:08 PM (7 years ago)

Author:

vboxsync

Message:

IPRT: Added RTDIR_F_NO_FOLLOW (not implemented yet).

Location:

trunk

Files:

• include/iprt/dir.h (modified) (1 diff)
• src/VBox/Runtime/r3/nt/direnum-r3-nt.cpp (modified) (3 diffs)
• src/VBox/Runtime/r3/posix/dir-posix.cpp (modified) (1 diff)

trunk/include/iprt/dir.h

@@ -352 +352 @@
 /** Deny relative opening of anything above this directory. */
 #define RTDIR_F_DENY_ASCENT     RT_BIT_32(1)
+/** Don't follow symbolic links in the final component. */
+#define RTDIR_F_NO_FOLLOW       RT_BIT_32(2)
 /** Valid flag mask.   */
-#define RTDIR_F_VALID_MASK      UINT32_C(0x00000003)
+#define RTDIR_F_VALID_MASK      UINT32_C(0x00000007)
 /** @} */
 

trunk/src/VBox/Runtime/r3/nt/direnum-r3-nt.cpp

@@ -108 +108 @@
 #endif
     if (hRelativeDir == ~(uintptr_t)0 && pvNativeRelative == NULL)
+    {
+        AssertMsg(pDir->fFlags & RTDIR_F_NO_FOLLOW /* Add FILE_OPEN_REPARSE_POINT and see how that works out (it better!). Need fallbacks for pre Vista. */,
+                  ("Implement RTDIR_F_NO_FOLLOW!\n"));
         rc = RTNtPathOpenDir(pszPathBuf,
                              FILE_LIST_DIRECTORY | FILE_READ_ATTRIBUTES | FILE_TRAVERSE | SYNCHRONIZE,
@@ -120 +123 @@
 #endif
                              );
+    }
     else if (pvNativeRelative != NULL)
+    {
+        AssertMsg(pDir->fFlags & RTDIR_F_NO_FOLLOW /* Add FILE_OPEN_REPARSE_POINT and see how that works out (it better!). Need fallbacks for pre Vista. */,
+                  ("Implement RTDIR_F_NO_FOLLOW!\n"));
         rc = RTNtPathOpenDirEx((HANDLE)hRelativeDir,
                                (struct _UNICODE_STRING *)pvNativeRelative,
@@ -135 +142 @@
 
                                );
+    }
     else
     {

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

@@ -237 +237 @@
     if (RT_SUCCESS(rc))
     {
-        pDir->pDir = opendir(pszNativePath);
+        if (!(pDir->fFlags & RTDIR_F_NO_FOLLOW))
+            pDir->pDir = opendir(pszNativePath);
+        else
+        {
+            AssertMsgFailed(("implement RTDIR_F_NO_FOLLOW\n"));
+            pDir->pDir = opendir(pszNativePath);
+        }
         if (pDir->pDir)
         {