Changeset 78153 in vbox for trunk/src/VBox/Runtime/common/path

Timestamp:

Apr 17, 2019 12:30:08 PM (6 years ago)

Author:

vboxsync

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

130068

Message:

IPRT: Added RTPATHABS_F_ENSURE_TRAILING_SLASH to RTPathAbsEx and fixed a couple of issues related to VERR_BUFFER_OVERFLOW code paths. bugref:9172

Location:

trunk/src/VBox/Runtime/common/path

Files:

• RTPathAbsDup.cpp (modified) (2 diffs)
• RTPathAbsEx.cpp (modified) (8 diffs)
• RTPathAbsExDup.cpp (modified) (1 diff)

trunk/src/VBox/Runtime/common/path/RTPathAbsDup.cpp

@@ -32 +32 @@
 #include <iprt/path.h>
 
-#include <iprt/err.h>
-#include <iprt/param.h>
-#include <iprt/string.h>
-
 
 /**
@@ -46 +42 @@
 RTDECL(char *) RTPathAbsDup(const char *pszPath)
 {
-    /* Try with a static buffer first. */
-    char szPath[RTPATH_MAX];
-    int rc = RTPathAbs(pszPath, szPath, sizeof(szPath));
-    if (RT_SUCCESS(rc))
-        return RTStrDup(szPath);
-
-    /* If it looks like we ran out of buffer space, double the size until
-       we reach 64 KB. */
-    if (rc == VERR_FILENAME_TOO_LONG || rc == VERR_BUFFER_OVERFLOW)
-    {
-        size_t cbBuf = RTPATH_MAX;
-        do
-        {
-            cbBuf *= 2;
-            char *pszBuf = RTStrAlloc(cbBuf);
-            if (!pszBuf)
-                break;
-            rc = RTPathAbs(pszPath, pszBuf, cbBuf);
-            if (RT_SUCCESS(rc))
-                return pszBuf;
-            RTStrFree(pszBuf);
-        } while (cbBuf <= _32K);
-    }
-    return NULL;
+    return RTPathAbsExDup(NULL, pszPath, RTPATH_STR_F_STYLE_HOST);
 }
 

trunk/src/VBox/Runtime/common/path/RTPathAbsEx.cpp

@@ -185 +185 @@
     {
         Assert(pBaseParsed->cComps > 1);
-        if (iLast >= 0 || (pParsed->fProps & RTPATH_PROP_DIR_SLASH))
+        if (   iLast >= 0
+            || (pParsed->fProps & RTPATH_PROP_DIR_SLASH)
+            || (fFlags & RTPATHABS_F_ENSURE_TRAILING_SLASH) )
             pBaseParsed->fProps |= RTPATH_PROP_DIR_SLASH;
         else
@@ -191 +193 @@
     }
 
+    /* Apply the trailing flash flag to the input path: */
+    if (   iLast >= 0
+        && (fFlags & RTPATHABS_F_ENSURE_TRAILING_SLASH))
+        pParsed->fProps |= RTPATH_PROP_DIR_SLASH;
+
     /*
      * Combine the two.  RTPathParsedReassemble can handle in place stuff, as
@@ -207 +214 @@
             rc = RTPathParsedReassemble(pszPath, pParsed, fFlags & RTPATH_STR_F_STYLE_MASK,
                                         &pszAbsPath[cchBaseInPlace], *pcbAbsPath - cchBaseInPlace);
-            *pcbAbsPath = cchBaseInPlace + pParsed->cchPath;
             if (RT_SUCCESS(rc))
+            {
+                *pcbAbsPath = cchBaseInPlace + pParsed->cchPath;
                 Assert(*pcbAbsPath == strlen(pszAbsPath));
+            }
+            else
+                *pcbAbsPath = cchBaseInPlace + pParsed->cchPath + 1;
         }
         else
@@ -219 +230 @@
         {
             RTPathParsedReassemble(pszPath, pParsed, fFlags & RTPATH_STR_F_STYLE_MASK, pszAbsPath, 0);
-            *pcbAbsPath = pBaseParsed->cchPath + pParsed->cchPath;
+            *pcbAbsPath = pBaseParsed->cchPath + pParsed->cchPath + 1;
         }
         else
-            *pcbAbsPath = pBaseParsed->cchPath;
+            *pcbAbsPath = pBaseParsed->cchPath + 1;
     }
 
@@ -448 +459 @@
         i++;
     }
+
+    /*
+     * Before we continue, ensure trailing slash if requested.
+     */
+    if (   (fFlags & RTPATHABS_F_ENSURE_TRAILING_SLASH)
+        && iLast > 0)
+        pParsed->fProps |= RTPATH_PROP_DIR_SLASH;
 
     /*
@@ -527 +545 @@
                 {
                     int rc2 = RTPathParsedReassemble(pszPath, pParsed, fFlags & RTPATH_STR_F_STYLE_MASK, pszAbsPath, 0);
-                    Assert(rc2 == VERR_BUFFER_OVERFLOW); RT_NOREF(rc2);
+                    Assert(rc2 == VERR_BUFFER_OVERFLOW);
 
                     char *pszTmp = (char *)RTMemTmpAlloc(RTPATH_BIG_MAX);
                     if (pszTmp)
                     {
-                        rc = RTPathGetCurrentDrive(pszTmp, RTPATH_BIG_MAX);
-                        if (RT_SUCCESS(rc))
+                        rc2 = RTPathGetCurrentDrive(pszTmp, RTPATH_BIG_MAX);
+                        if (RT_SUCCESS(rc2))
                             *pcbAbsPath = strlen(pszTmp) + pParsed->cchPath + 1;
                         else
@@ -570 +588 @@
                 pParsed->aComps[i].cch = 0;
     }
+
+    if (   (fFlags & RTPATHABS_F_ENSURE_TRAILING_SLASH)
+        && pParsed->cComps > 1)
+        pParsed->fProps |= RTPATH_PROP_DIR_SLASH;
+
     int rc = RTPathParsedReassemble(pszPath, pParsed, fFlags & RTPATH_STR_F_STYLE_MASK, pszAbsPath, *pcbAbsPath);
     *pcbAbsPath = pParsed->cchPath + (rc == VERR_BUFFER_OVERFLOW);
@@ -589 +612 @@
 
     AssertCompile(RTPATH_STR_F_STYLE_HOST == 0);
-    AssertReturn(   RTPATH_STR_F_IS_VALID(fFlags, RTPATHABS_F_STOP_AT_BASE | RTPATHABS_F_STOP_AT_CWD)
+    AssertReturn(   RTPATH_STR_F_IS_VALID(fFlags, RTPATHABS_F_STOP_AT_BASE | RTPATHABS_F_STOP_AT_CWD | RTPATHABS_F_ENSURE_TRAILING_SLASH)
                  && !(fFlags & RTPATH_STR_F_MIDDLE), VERR_INVALID_FLAGS);
     if ((fFlags & RTPATH_STR_F_STYLE_MASK) == RTPATH_STR_F_STYLE_HOST)

trunk/src/VBox/Runtime/common/path/RTPathAbsExDup.cpp

@@ -39 +39 @@
 RTDECL(char *) RTPathAbsExDup(const char *pszBase, const char *pszPath, uint32_t fFlags)
 {
-    char szPath[RTPATH_MAX];
-    size_t cbPath = sizeof(szPath);
-    int rc = RTPathAbsEx(pszBase, pszPath, fFlags, szPath, &cbPath);
-    if (RT_SUCCESS(rc))
-        return RTStrDup(szPath);
+    unsigned    cTries    = 16;
+    size_t      cbAbsPath = RTPATH_MAX / 2;
+    for (;;)
+    {
+        char  *pszAbsPath = RTStrAlloc(cbAbsPath);
+        if (pszAbsPath)
+        {
+            size_t cbActual = cbAbsPath;
+            int rc = RTPathAbsEx(pszBase, pszPath, fFlags, pszAbsPath, &cbActual);
+            if (RT_SUCCESS(rc))
+            {
+                if (cbActual < cbAbsPath / 2)
+                    RTStrRealloc(&pszAbsPath, cbActual + 1);
+                return pszAbsPath;
+            }
 
-    if (rc == VERR_BUFFER_OVERFLOW)
-    {
-        size_t   cbPrevPath = sizeof(szPath);
-        uint32_t cTries = 8;
-        while (cTries-- > 0)
-        {
-            cbPath     = RT_MAX(RT_ALIGN_Z(cbPath + 16, 64), cbPrevPath + 256);
-            cbPrevPath = cbPath;
-            char *pszAbsPath = (char *)RTStrAlloc(cbPath);
-            if (pszAbsPath)
-            {
-                rc = RTPathAbsEx(pszBase, pszPath, fFlags, pszAbsPath, &cbPath);
-                if (RT_SUCCESS(rc))
-                    return pszAbsPath;
-                RTStrFree(pszAbsPath);
-            }
-            else
+            RTStrFree(pszAbsPath);
+
+            if (rc != VERR_BUFFER_OVERFLOW)
                 break;
+
+            if (--cTries == 0)
+                break;
+
+            cbAbsPath = RT_MAX(RT_ALIGN_Z(cbActual + 16, 64), cbAbsPath + 256);
         }
+        else
+            break;
     }
     return NULL;