Changeset 78048 in vbox for trunk/src/VBox/Runtime/generic

Timestamp:

Apr 9, 2019 1:21:09 AM (6 years ago)

Author:

vboxsync

Message:

IPRT: Working on new RTPathAbsEx implementation, temporarily called RTPathAbsExEx. This should fix most of the bugs in the current RTPathAbs/Ex code and do away with the fixed path buffer limitations. Also introduces a RTPATH_BIG_MAX, given that RTPATH_MAX is just a reasonable and not absolute MAX value. The new one is more or less absolute and must never be used for stack buffers. bugref:9172

Location:

trunk/src/VBox/Runtime/generic

Files:

• RTPathAbs-generic.cpp (modified) (8 diffs)
• RTPathGetCurrentDrive-generic.cpp (modified) (4 diffs)

trunk/src/VBox/Runtime/generic/RTPathAbs-generic.cpp

@@ -40 +40 @@
 #include "internal/fs.h"
 
+#if 1
 
 static char *rtPathSkipRootSpec(char *pszCur)
@@ -145 +146 @@
 
 
-RTDECL(int) RTPathAbs(const char *pszPath, char *pszAbsPath, size_t cchAbsPath)
+RTDECL(int) RTPathAbs(const char *pszPath, char *pszAbsPath, size_t cbAbsPath)
 {
     int rc;
@@ -163 +164 @@
     if (cchPath >= RTPATH_MAX)
     {
-        LogFlow(("RTPathAbs(%p:{%s}, %p, %d): returns %Rrc\n", pszPath, pszPath, pszAbsPath, cchAbsPath, VERR_FILENAME_TOO_LONG));
+        LogFlow(("RTPathAbs(%p:{%s}, %p, %d): returns %Rrc\n", pszPath, pszPath, pszAbsPath, cbAbsPath, VERR_FILENAME_TOO_LONG));
         return VERR_FILENAME_TOO_LONG;
     }
@@ -179 +180 @@
             || (cchTmpPath == 2 && szTmpPath[1] == RTPATH_SLASH))
         {
-            rc = RTPathGetCurrent(pszAbsPath, cchAbsPath);
+            rc = RTPathGetCurrent(pszAbsPath, cbAbsPath);
             if (RT_SUCCESS(rc))
             {
@@ -191 +192 @@
                     && (uintptr_t)&pszAbsPath[cch - 1] > (uintptr_t)pszTop && pszAbsPath[cch - 1] != RTPATH_SLASH)
                 {
-                    if (cch + 1 < cchAbsPath)
+                    if (cch + 1 < cbAbsPath)
                     {
                         pszAbsPath[cch++] = RTPATH_SLASH;
@@ -274 +275 @@
         if (RT_FAILURE(rc))
         {
-            LogFlow(("RTPathAbs(%p:{%s}, %p, %d): returns %Rrc\n", pszPath, pszPath, pszAbsPath, cchAbsPath, rc));
+            LogFlow(("RTPathAbs(%p:{%s}, %p, %d): returns %Rrc\n", pszPath, pszPath, pszAbsPath, cbAbsPath, rc));
             return rc;
         }
@@ -360 +361 @@
      * Copy the result to the user buffer.
      */
-    if (cchTmpPath < cchAbsPath)
+    if (cchTmpPath < cbAbsPath)
     {
         memcpy(pszAbsPath, szTmpPath, cchTmpPath + 1);
@@ -369 +370 @@
 
     LogFlow(("RTPathAbs(%p:{%s}, %p:{%s}, %d): returns %Rrc\n", pszPath, pszPath, pszAbsPath,
-             RT_SUCCESS(rc) ? pszAbsPath : "<failed>", cchAbsPath, rc));
+             RT_SUCCESS(rc) ? pszAbsPath : "<failed>", cbAbsPath, rc));
     return rc;
 }
 
+#else
+
+RTDECL(int) RTPathAbs(const char *pszPath, char *pszAbsPath, size_t cbAbsPath)
+{
+    return RTPathAbsExEx(NULL, pszPath, RTPATH_STR_F_STYLE_HOST, pszAbsPath, &cbAbsPath);
+}
+
+#endif
+

trunk/src/VBox/Runtime/generic/RTPathGetCurrentDrive-generic.cpp

@@ -35 +35 @@
 #include <iprt/ctype.h>
 #include <iprt/err.h>
+#include <iprt/mem.h>
 #include <iprt/string.h>
 #include "internal/path.h"
@@ -45 +46 @@
      * Query the current directroy and extract the wanted information from it.
      */
-    int rc = RTPathGetCurrent(pszPath, cbPath);
+    char *pszPathFree = NULL;
+    char *pszCwd = pszPath;
+    int rc = RTPathGetCurrent(pszCwd, cbPath);
+    if (RT_SUCCESS(rc))
+    { /* likely */ }
+    else if (rc != VERR_BUFFER_OVERFLOW)
+        return rc;
+    else
+    {
+        pszPathFree = pszCwd = (char *)RTMemTmpAlloc(RTPATH_BIG_MAX);
+        AssertReturn(pszPathFree, VERR_NO_TMP_MEMORY);
+        rc = RTPathGetCurrent(pszCwd, RTPATH_BIG_MAX);
+    }
     if (RT_SUCCESS(rc))
     {
@@ -51 +64 @@
          * Drive letter? Chop off at root slash.
          */
-        if (pszPath[0] && RTPATH_IS_VOLSEP(pszPath[1]))
-        {
-            pszPath[2] = '\0';
-            return rc;
-        }
-
+        if (pszCwd[0] && RTPATH_IS_VOLSEP(pszCwd[1]))
+            pszCwd[2] = '\0';
         /*
          * UNC? Chop off after share.
          */
-        if (   RTPATH_IS_SLASH(pszPath[0])
-            && RTPATH_IS_SLASH(pszPath[1])
-            && !RTPATH_IS_SLASH(pszPath[2])
-            && pszPath[2])
+        else if (   RTPATH_IS_SLASH(pszCwd[0])
+                 && RTPATH_IS_SLASH(pszCwd[1])
+                 && !RTPATH_IS_SLASH(pszCwd[2])
+                 && pszCwd[2])
         {
             /* Work thru the server name. */
             size_t off = 3;
-            while (!RTPATH_IS_SLASH(pszPath[off]) && pszPath[off])
+            while (!RTPATH_IS_SLASH(pszCwd[off]) && pszCwd[off])
                 off++;
             size_t offServerSlash = off;
 
             /* Is there a share name? */
-            if (RTPATH_IS_SLASH(pszPath[off]))
+            if (RTPATH_IS_SLASH(pszCwd[off]))
             {
-                while (RTPATH_IS_SLASH(pszPath[off]))
+                while (RTPATH_IS_SLASH(pszCwd[off]))
                     off++;
-                if (pszPath[off])
+                if (pszCwd[off])
                 {
                     /* Work thru the share name. */
-                    while (!RTPATH_IS_SLASH(pszPath[off]) && pszPath[off])
+                    while (!RTPATH_IS_SLASH(pszCwd[off]) && pszCwd[off])
                         off++;
                 }
@@ -86 +95 @@
                     off = offServerSlash;
             }
+            pszCwd[off] = '\0';
         }
-        return VERR_INTERNAL_ERROR_4;
+        else
+            rc = VERR_INTERNAL_ERROR_4;
+    }
+    if (pszPathFree)
+    {
+        if (RT_SUCCESS(rc))
+            rc = RTStrCopy(pszPath, cbPath, pszCwd);
+        RTMemTmpFree(pszPathFree);
     }
     return rc;