Changeset 85384 in vbox for trunk/src/VBox/Runtime

Timestamp:

Jul 18, 2020 9:17:43 PM (5 years ago)

Author:

vboxsync

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

139398

Message:

iprt/path.h: Reimplemented RTPathFindCommon[Ex].

Location:

trunk/src/VBox/Runtime

Files:

• common/path/RTPathFindCommon.cpp (modified) (1 diff)
• common/path/RTPathFindCommon.cpp.h (added)
• testcase/tstRTPath.cpp (modified) (4 diffs)

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

@@ -30 +30 @@
 *********************************************************************************************************************************/
 #include "internal/iprt.h"
+#include <iprt/path.h>
+
+#include <iprt/alloca.h>
 #include <iprt/assert.h>
 #include <iprt/errcore.h>
-#include <iprt/path.h>
+#include <iprt/mem.h>
+#include <iprt/string.h>
+#include <iprt/uni.h>
+
+
+#define RTPATH_TEMPLATE_CPP_H "RTPathFindCommon.cpp.h"
+#include "rtpath-expand-template.cpp.h"
 
 
 RTDECL(size_t) RTPathFindCommonEx(size_t cPaths, const char * const *papszPaths, uint32_t fFlags)
 {
+    /*
+     * Validate input.
+     */
+    AssertReturn(RTPATH_STR_F_IS_VALID(fFlags, RTPATHFINDCOMMON_F_IGNORE_DOTDOT), 0);
     AssertReturn(cPaths > 0, 0);
     AssertPtrReturn(papszPaths, 0);
-    AssertReturn(RTPATH_STR_F_IS_VALID(fFlags, 0), 0);
+    size_t i = cPaths;
+    while (i-- > 0)
+        AssertPtrReturn(papszPaths[i], 0);
 
-    /** @todo r=bird: Extremely naive code.
-     * - The original idea of taking either '/' or '\\' as separators is very out of
-     *   touch with the rest of path.h.  On DOS based systems we need to handle both
-     *   of those as well as ':'.
-     * - Why compare pszRef with itself?
-     * - Why derefernece pszRef[cch] for each other path.
-     * - Why perform NULL checks for each outer iteration.
-     * - Why perform '\0' check before comparing with pszRef[cch]?
-     *   It's sufficient to check if pszRef[cch] is '\0'.
-     * - Why backtrack to the last path separator?  It won't return the expected
-     *   result for cPaths=1, unless the path ends with a separator.
-     * - Multiple consequtive path separators must be treated as a single one (most
-     *   of the time anyways - UNC crap).
+    /*
+     * Duplicate papszPaths so we can have individual positions in each path.
+     * Use the stack if we haven't got too many paths.
      */
-    const char *pszRef = papszPaths[0]; /* The reference we're comparing with. */
-    const char chNaiveSep = (fFlags & RTPATH_STR_F_STYLE_MASK) == RTPATH_STR_F_STYLE_HOST
-                          ? RTPATH_SLASH
-                          : (fFlags & RTPATH_STR_F_STYLE_MASK) == RTPATH_STR_F_STYLE_DOS ? '\\' : '/';
+    void        *pvFree;
+    const char **papszCopy;
+    size_t      cbNeeded = cPaths * sizeof(papszCopy[0]);
+    if (cbNeeded <= _2K)
+    {
+        pvFree = NULL;
+        papszCopy = (const char **)alloca(cbNeeded);
+    }
+    else
+    {
+        pvFree = RTMemTmpAlloc(cbNeeded);
+        papszCopy = (const char **)pvFree;
+    }
+    AssertReturn(papszCopy, 0);
+    memcpy(papszCopy, papszPaths, cbNeeded);
 
-    size_t cch = 0;
-    do
+    /*
+     * Invoke the worker for the selected path style.
+     */
+    size_t cchRet;
+    switch (fFlags & RTPATH_STR_F_STYLE_MASK)
     {
-        for (size_t i = 0; i < cPaths; ++i)
-        {
-            const char *pcszPath = papszPaths[i];
-            if (   pcszPath
-                && pcszPath[cch]
-                && pcszPath[cch] == pszRef[cch])
-                continue;
+#if RTPATH_STYLE == RTPATH_STR_F_STYLE_DOS
+        case RTPATH_STR_F_STYLE_HOST:
+#endif
+        case RTPATH_STR_F_STYLE_DOS:
+            cchRet= rtPathFindCommonStyleDos(cPaths, papszCopy, fFlags);
+            break;
 
-            while (   cch
-                   && pszRef[--cch] != chNaiveSep) { }
+#if RTPATH_STYLE != RTPATH_STR_F_STYLE_DOS
+        case RTPATH_STR_F_STYLE_HOST:
+#endif
+        case RTPATH_STR_F_STYLE_UNIX:
+            cchRet = rtPathFindCommonStyleUnix(cPaths, papszCopy, fFlags);
+            break;
 
-            return cch ? cch + 1 : 0;
-        }
-    } while (++cch);
+        default:
+            AssertFailedStmt(cchRet = 0); /* impossible */
+    }
 
-    return 0;
+    /*
+     * Clean up and return.
+     */
+    if (pvFree)
+        RTMemTmpFree(pvFree);
+    return cchRet;
 }
 RT_EXPORT_SYMBOL(RTPathFindCommonEx);

trunk/src/VBox/Runtime/testcase/tstRTPath.cpp

@@ -371 +371 @@
         { { "",                     "",                 "",                     NULL, },            RTPATH_STR_F_STYLE_UNIX,
             "" },
+        { { "",                     "",                 "",                     NULL, },            RTPATH_STR_F_STYLE_DOS,
+            "" },
         { { "none",                 "none",             "",                     NULL, },            RTPATH_STR_F_STYLE_UNIX,
             "" },
-        /* Missing start slash. */
+        { { "none",                 "none",             "",                     NULL, },            RTPATH_STR_F_STYLE_DOS,
+            "" },
+        { { "same",                 "same",             "same",                 "same", },          RTPATH_STR_F_STYLE_UNIX,
+            "same" },
+        { { "same",                 "same",             "same",                 "same", },          RTPATH_STR_F_STYLE_DOS,
+            "same" },
+        /* More complicated. */
         { { "/path/to/stuff1",      "path/to/stuff2",   NULL,                   NULL, },            RTPATH_STR_F_STYLE_UNIX,
             "" },
-        /* Working stuff. */
         { { "/path/to/stuff1",      "/path/to/stuff2",  "/path/to/stuff3",      NULL, },            RTPATH_STR_F_STYLE_UNIX,
             "/path/to/" },
@@ -382 +389 @@
             "/path/" },
         { { "/path/to/stuff1",      "/",                "/path/",               NULL, },            RTPATH_STR_F_STYLE_UNIX,
-            "" },
+            "/" },
         { { "/path/to/../stuff1",   "./../",            "/path/to/stuff2/..",   NULL, },            RTPATH_STR_F_STYLE_UNIX,
             "" },
-
-#if 0 /** @todo */
-        /* Things that should be working that aren't: */
         { { "a/single/path",        NULL,               NULL,                   NULL, },            RTPATH_STR_F_STYLE_UNIX,
             "a/single/path" },
@@ -396 +400 @@
         { { "c:/windows",           "c:\\program files", "C:\\AppData",         NULL, },            RTPATH_STR_F_STYLE_DOS,
             "c:/" },
+        { { "c:/windows",           "c:windows",        "C:system32",           NULL, },            RTPATH_STR_F_STYLE_DOS,
+            "c:" },
+        { { "c:/windows",           "d:windows",        "e:windows",            NULL, },            RTPATH_STR_F_STYLE_DOS,
+            "" },
         { { "//usr/bin/env",        "/usr//bin/env",   "/usr/bin///env",        "/usr/bin/env", },  RTPATH_STR_F_STYLE_UNIX,
             "//usr/bin/env" },
@@ -404 +412 @@
         { { "//./unc/is/weird",     "///./unc/is/weird", NULL,                  NULL, },            RTPATH_STR_F_STYLE_DOS,
             "" },
+        { { "//system360/share",    "//system370/share", "//system390/share",   NULL, },            RTPATH_STR_F_STYLE_DOS,
+            "" },
+        { { "//system370/share1",   "//sysTEM370/share2", "//SYsTeM370/share3", NULL, },            RTPATH_STR_F_STYLE_DOS,
+            "//system370/" },
+        { { "//system370/share1",   "Z:/",              NULL,                   NULL, },            RTPATH_STR_F_STYLE_DOS,
+            "" },
+        { { "//system370/share1",   "/",                NULL,                   NULL, },            RTPATH_STR_F_STYLE_DOS,
+            "" },
+        { { "//system370/share1",   "somedir",          NULL,                   NULL, },            RTPATH_STR_F_STYLE_DOS,
+            "" },
         { { "/path/to/stuff1",      "path/to/stuff2",   NULL,                   NULL, },            RTPATH_STR_F_STYLE_UNIX | RTPATH_STR_F_NO_START,
             "/path/to/" },
         { { "path/to/stuff1",       "//path\\/to\\stuff2", NULL,                NULL, },            RTPATH_STR_F_STYLE_DOS | RTPATH_STR_F_NO_START,
             "path/to/" },
-
-        /* '..' elements are not supported for now and leads to zero return. */
+        /* '..' elements are not supported for now and leads to zero return, unless RTPATHFINDCOMMON_F_IGNORE_DOTDOT is given. */
         { { "/usr/bin/env",         "/usr/../usr/bin/env", "/usr/bin/../bin/env", NULL, },          RTPATH_STR_F_STYLE_UNIX,
             "" },
         { { "/lib/",                "/lib/amd64/../lib.so", "/lib/i386/../libdl.so", NULL, },       RTPATH_STR_F_STYLE_UNIX,
             "" },
-#endif
+        { { "/lib/",                "/lib/amd64/../lib.so", "/lib/i386/../libdl.so", NULL, },       RTPATH_STR_F_STYLE_UNIX | RTPATHFINDCOMMON_F_IGNORE_DOTDOT,
+            "/lib/" },
     };