Changeset 64620 in vbox for trunk/src/VBox

Timestamp:

Nov 9, 2016 5:44:36 PM (8 years ago)

Author:

vboxsync

Message:

IPRT: Distinguish between actual symbolic links and other reparse points on NT/Windows.

Location:

trunk/src/VBox/Runtime

Files:

• include/internal/fs.h (modified) (1 diff)
• r3/fs.cpp (modified) (3 diffs)
• r3/nt/direnum-r3-nt.cpp (modified) (2 diffs)
• r3/win/direnum-win.cpp (modified) (1 diff)
• r3/win/fileio-win.cpp (modified) (1 diff)
• r3/win/path-win.cpp (modified) (5 diffs)

trunk/src/VBox/Runtime/include/internal/fs.h

@@ -35 +35 @@
 RT_C_DECLS_BEGIN
 
-RTFMODE rtFsModeFromDos(RTFMODE fMode, const char *pszName, size_t cbName);
+/** IO_REPARSE_TAG_SYMLINK */
+#define RTFSMODE_SYMLINK_REPARSE_TAG UINT32_C(0xa000000c)
+
+RTFMODE rtFsModeFromDos(RTFMODE fMode, const char *pszName, size_t cbName, uint32_t uReparseTag);
 RTFMODE rtFsModeFromUnix(RTFMODE fMode, const char *pszName, size_t cbName);
 RTFMODE rtFsModeNormalize(RTFMODE fMode, const char *pszName, size_t cbName);

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

@@ -48 +48 @@
  * @param   pszName     The filename which this applies to (exe check).
  * @param   cbName      The length of that filename. (optional, set 0)
- */
-RTFMODE rtFsModeFromDos(RTFMODE fMode, const char *pszName, size_t cbName)
+ * @param   uReparseTag The reparse tag if RTFS_DOS_NT_REPARSE_POINT is set.
+ */
+RTFMODE rtFsModeFromDos(RTFMODE fMode, const char *pszName, size_t cbName, uint32_t uReparseTag)
 {
     fMode &= ~((1 << RTFS_DOS_SHIFT) - 1);
@@ -83 +84 @@
 
     /* Is it really a symbolic link? */
-    if (fMode & RTFS_DOS_NT_REPARSE_POINT)
+    if ((fMode & RTFS_DOS_NT_REPARSE_POINT) && uReparseTag == RTFSMODE_SYMLINK_REPARSE_TAG)
         fMode = (fMode & ~RTFS_TYPE_MASK) | RTFS_TYPE_SYMLINK;
 
@@ -138 +139 @@
 {
     if (!(fMode & RTFS_UNIX_MASK))
-        fMode = rtFsModeFromDos(fMode, pszName, cbName);
+        fMode = rtFsModeFromDos(fMode, pszName, cbName, RTFSMODE_SYMLINK_REPARSE_TAG);
     else if (!(fMode & RTFS_DOS_MASK))
         fMode = rtFsModeFromUnix(fMode, pszName, cbName);

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

@@ -580 +580 @@
             case FILE_ATTRIBUTE_REPARSE_POINT:
             case FILE_ATTRIBUTE_REPARSE_POINT | FILE_ATTRIBUTE_DIRECTORY:
-                pDirEntry->enmType = RTDIRENTRYTYPE_SYMLINK;
+                /* EaSize is here reused for returning the repharse tag value. */
+                if (pDir->uCurData.pBoth->EaSize == IO_REPARSE_TAG_SYMLINK)
+                    pDirEntry->enmType = RTDIRENTRYTYPE_SYMLINK;
                 break;
         }
@@ -686 +688 @@
 
         pDirEntry->Info.Attr.fMode  = rtFsModeFromDos((pBoth->FileAttributes << RTFS_DOS_SHIFT) & RTFS_DOS_MASK_NT,
-                                                       pszName, cchName);
+                                                       pszName, cchName, pBoth->EaSize);
     }
 #ifdef IPRT_WITH_NT_PATH_PASSTHRU

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

@@ -340 +340 @@
 
     pDirEntry->Info.Attr.fMode  = rtFsModeFromDos((pDir->Data.dwFileAttributes << RTFS_DOS_SHIFT) & RTFS_DOS_MASK_NT,
-                                                   pszName, cchName);
+                                                   pszName, cchName, pDir->Data.dwReserved0);
 
     /*

trunk/src/VBox/Runtime/r3/win/fileio-win.cpp

@@ -892 +892 @@
     pObjInfo->ChangeTime  = pObjInfo->ModificationTime;
 
-    pObjInfo->Attr.fMode  = rtFsModeFromDos((Data.dwFileAttributes << RTFS_DOS_SHIFT) & RTFS_DOS_MASK_NT, "", 0);
+    pObjInfo->Attr.fMode  = rtFsModeFromDos((Data.dwFileAttributes << RTFS_DOS_SHIFT) & RTFS_DOS_MASK_NT, "", 0,
+                                            RTFSMODE_SYMLINK_REPARSE_TAG /* (symlink or not, doesn't usually matter here) */);
 
     /*

trunk/src/VBox/Runtime/r3/win/path-win.cpp

@@ -271 +271 @@
      * Query file info.
      */
+    uint32_t uReparseTag = RTFSMODE_SYMLINK_REPARSE_TAG;
     WIN32_FILE_ATTRIBUTE_DATA Data;
     PRTUTF16 pwszPath;
@@ -297 +298 @@
             Data.nFileSizeHigh      = FindData.nFileSizeHigh;
             Data.nFileSizeLow       = FindData.nFileSizeLow;
+            uReparseTag             = FindData.dwReserved0;
         }
         else
@@ -311 +313 @@
      */
     /** @todo we're too lazy wrt to error paths here... */
-    if (   (fFlags & RTPATH_F_FOLLOW_LINK)
-        && (Data.dwFileAttributes & FILE_ATTRIBUTE_REPARSE_POINT))
+    if (   (Data.dwFileAttributes & FILE_ATTRIBUTE_REPARSE_POINT)
+        && ((fFlags & RTPATH_F_FOLLOW_LINK) || uReparseTag != RTFSMODE_SYMLINK_REPARSE_TAG))
     {
         HANDLE hFinal = CreateFileW(pwszPath,
@@ -332 +334 @@
                 Data.nFileSizeHigh      = FileData.nFileSizeHigh;
                 Data.nFileSizeLow       = FileData.nFileSizeLow;
+                uReparseTag             = 0;
             }
             CloseHandle(hFinal);
@@ -359 +362 @@
 
     pObjInfo->Attr.fMode  = rtFsModeFromDos((Data.dwFileAttributes << RTFS_DOS_SHIFT) & RTFS_DOS_MASK_NT,
-                                            pszPath, strlen(pszPath));
+                                            pszPath, strlen(pszPath), uReparseTag);
 
     /*