Changeset 78050 in vbox for trunk/src

Timestamp:

Apr 9, 2019 1:30:42 AM (6 years ago)

Author:

vboxsync

Message:

IPRT/dir: Lifting RTPATH_MAX restriction on RTDirOpen*. bugref:9172

Location:

trunk/src/VBox/Runtime

Files:

• include/internal/dir.h (modified) (2 diffs)
• r3/dir.cpp (modified) (7 diffs)
• r3/nt/direnum-r3-nt.cpp (modified) (2 diffs)
• r3/posix/dir-posix.cpp (modified) (1 diff)
• r3/win/direnum-win.cpp (modified) (2 diffs)

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

@@ -175 +175 @@
  * @param   pDir                The directory to open. The pszPath member contains the
  *                              path to the directory.
- * @param   pszPathBuf          Pointer to a RTPATH_MAX sized buffer containing
- *                              pszPath.  Find-first style systems can use this
- *                              to setup the wildcard expression.
  * @param   hRelativeDir        The directory @a pvNativeRelative is relative,
  *                              ~(uintptr_t)0 if absolute.
@@ -183 +180 @@
  *                              we're to use (consume) hRelativeDir.
  */
-int rtDirNativeOpen(PRTDIRINTERNAL pDir, char *pszPathBuf, uintptr_t hRelativeDir, void *pvNativeRelative);
+int rtDirNativeOpen(PRTDIRINTERNAL pDir, uintptr_t hRelativeDir, void *pvNativeRelative);
 
 /**

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

@@ -527 +527 @@
      * As a sideeffect we also validate the path here.
      */
-    char   szRealPath[RTPATH_MAX + 1];
-    int    rc;
+    char  *pszAbsPath;
     size_t cbFilter;                    /* includes '\0' (thus cb and not cch). */
     size_t cucFilter0;                  /* includes U+0. */
@@ -544 +543 @@
 
         cbFilter = cucFilter0 = 0;
-        rc = RTPathAbs(pszPath, szRealPath, sizeof(szRealPath) - 1);
+        pszAbsPath = RTPathAbsDup(pszPath);
     }
     else
@@ -558 +557 @@
                 return VERR_NO_MEMORY;
             pszTmp[pszFilter - pszPath] = '\0';
-            rc = RTPathAbs(pszTmp, szRealPath, sizeof(szRealPath) - 1);
+            pszAbsPath = RTPathAbsDup(pszTmp);
             RTStrFree(pszTmp);
         }
         else
-            rc = RTPathReal(".", szRealPath, sizeof(szRealPath) - 1);
+            pszAbsPath = RTPathAbsDup(".");
         fDirSlash = true;
     }
-    if (RT_FAILURE(rc))
-        return rc;
-
-    /* add trailing '/' if missing. */
-    size_t cchRealPath = strlen(szRealPath);
-    if (!RTPATH_IS_SEP(szRealPath[cchRealPath - 1]))
-    {
-        szRealPath[cchRealPath++] = RTPATH_SLASH;
-        szRealPath[cchRealPath] = '\0';
-    }
+    if (!pszAbsPath)
+        return VERR_NO_MEMORY;
+
+
 
     /*
@@ -582 +575 @@
      * thus the horrible ugliness here. Solaris uses d_name[1] for instance.
      */
-    size_t cbDir = rtDirNativeGetStructSize(szRealPath);
-    size_t const cbAllocated = cbDir
-                             + cucFilter0 * sizeof(RTUNICP)
-                             + cbFilter
-                             + cchRealPath + 1 + 4;
+    size_t const cchAbsPath      = strlen(pszAbsPath);
+    size_t const cchAbsPathExtra = !RTPATH_IS_SEP(pszAbsPath[cchAbsPath - 1]) ? 1 : 0; /* add trailing '/' if missing */
+    size_t const cbDir           = rtDirNativeGetStructSize(pszAbsPath);
+    size_t const cbAllocated     = cbDir
+                                 + cucFilter0 * sizeof(RTUNICP)
+                                 + cbFilter
+                                 + cchAbsPath + cchAbsPathExtra + 1 + 4;
     PRTDIRINTERNAL pDir = (PRTDIRINTERNAL)RTMemAllocZ(cbAllocated);
     if (!pDir)
+    {
+        RTStrFree(pszAbsPath);
         return VERR_NO_MEMORY;
+    }
     uint8_t *pb = (uint8_t *)pDir + cbDir;
 
@@ -598 +596 @@
     {
         pDir->puszFilter = (PRTUNICP)pb;
-        rc = RTStrToUniEx(pszFilter, RTSTR_MAX, &pDir->puszFilter, cucFilter0, &pDir->cucFilter);
-        AssertRC(rc);
+        int rc2 = RTStrToUniEx(pszFilter, RTSTR_MAX, &pDir->puszFilter, cucFilter0, &pDir->cucFilter);
+        AssertRC(rc2);
         pb += cucFilter0 * sizeof(RTUNICP);
         pDir->pszFilter = (char *)memcpy(pb, pszFilter, cbFilter);
@@ -629 +627 @@
             break;
     }
-    pDir->cchPath       = cchRealPath;
-    pDir->pszPath       = (char *)memcpy(pb, szRealPath, cchRealPath + 1);
-    Assert(pb - (uint8_t *)pDir + cchRealPath + 1 <= cbAllocated);
+    pDir->cchPath       = cchAbsPath + cchAbsPathExtra;
+    pDir->pszPath       = (char *)memcpy(pb, pszAbsPath, cchAbsPath);
+    pb[cchAbsPath]                   = RTPATH_SLASH;
+    pb[cchAbsPath + cchAbsPathExtra] = '\0';
+    Assert(pb - (uint8_t *)pDir + cchAbsPath + cchAbsPathExtra + 1 <= cbAllocated);
     pDir->pszName       = NULL;
     pDir->cchName       = 0;
@@ -641 +641 @@
      * Hand it over to the native part.
      */
-    rc = rtDirNativeOpen(pDir, szRealPath, hRelativeDir, pvNativeRelative);
+    int rc = rtDirNativeOpen(pDir, hRelativeDir, pvNativeRelative);
     if (RT_SUCCESS(rc))
         *phDir = pDir;
     else
         RTMemFree(pDir);
-
+    RTStrFree(pszAbsPath);
     return rc;
 }

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

@@ -83 +83 @@
 
 
-int rtDirNativeOpen(PRTDIRINTERNAL pDir, char *pszPathBuf, uintptr_t hRelativeDir, void *pvNativeRelative)
+int rtDirNativeOpen(PRTDIRINTERNAL pDir, uintptr_t hRelativeDir, void *pvNativeRelative)
 {
     /*
@@ -130 +130 @@
         {
             if (pvNativeRelative == NULL)
-                rc = RTNtPathOpenDir(pszPathBuf,
+                rc = RTNtPathOpenDir(pDir->pszPath,
                                      FILE_LIST_DIRECTORY | FILE_READ_ATTRIBUTES | FILE_TRAVERSE | SYNCHRONIZE,
                                      FILE_SHARE_READ | FILE_SHARE_WRITE,

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

@@ -242 +242 @@
 
 
-int rtDirNativeOpen(PRTDIRINTERNAL pDir, char *pszPathBuf, uintptr_t hRelativeDir, void *pvNativeRelative)
-{
-    NOREF(pszPathBuf); /* only used on windows */
+int rtDirNativeOpen(PRTDIRINTERNAL pDir, uintptr_t hRelativeDir, void *pvNativeRelative)
+{
     NOREF(hRelativeDir);
     NOREF(pvNativeRelative);

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

@@ -51 +51 @@
 
 
-int rtDirNativeOpen(PRTDIRINTERNAL pDir, char *pszPathBuf, uintptr_t hRelativeDir, void *pvNativeRelative))
+int rtDirNativeOpen(PRTDIRINTERNAL pDir, uintptr_t hRelativeDir, void *pvNativeRelative))
 {
     RT_NOREF(hRelativeDir, pvNativeRelative);
@@ -62 +62 @@
      * it when adding the wildcard expression.
      */
+/** @todo the pszPathBuf argument was removed in order to support paths longer than RTPATH_MAX.  Rewrite this code. */
     size_t cbExpr;
     const char *pszExpr;