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

Timestamp:

Apr 10, 2019 2:19:04 PM (6 years ago)

Author:

vboxsync

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

129946

Message:

*,IPRT: Use new RTPathAbsExEx function instead of RTPathAbsEx. bugref:9172

Location:

trunk/src/VBox/Runtime/common/path

Files:

• RTPathAbsEx.cpp (modified) (1 diff)
• RTPathAbsExDup.cpp (modified) (1 diff)

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

@@ -53 +53 @@
 RTDECL(int) RTPathAbsEx(const char *pszBase, const char *pszPath, char *pszAbsPath, size_t cbAbsPath)
 {
-#if 1
+#if 0
     if (    pszBase
         &&  pszPath

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

@@ -50 +50 @@
 {
     char szPath[RTPATH_MAX];
-    int rc = RTPathAbsEx(pszBase, pszPath, szPath, sizeof(szPath));
+    size_t cbPath = sizeof(szPath);
+    int rc = RTPathAbsExEx(pszBase, pszPath, RTPATH_STR_F_STYLE_HOST, szPath, &cbPath);
     if (RT_SUCCESS(rc))
         return RTStrDup(szPath);
+
+    if (rc == VERR_BUFFER_OVERFLOW)
+    {
+        size_t   cbPrevPath = sizeof(szPath);
+        uint32_t cTries = 6;
+        while (cTries-- > 0)
+        {
+            cbPath     = RT_MAX(RT_ALIGN_Z(cbPath + 16, 64), cbPrevPath + 256);
+            cbPrevPath = cbPath;
+            char *pszAbsPath = (char *)RTStrAlloc(cbPath);
+            if (pszAbsPath)
+            {
+                rc = RTPathAbsExEx(pszBase, pszPath, RTPATH_STR_F_STYLE_HOST, pszAbsPath, &cbPath);
+                if (RT_SUCCESS(rc))
+                    return pszAbsPath;
+                RTStrFree(pszAbsPath);
+            }
+            else
+                break;
+        }
+    }
     return NULL;
 }