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

Timestamp:

Oct 10, 2019 10:23:32 AM (5 years ago)

Author:

vboxsync

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

133859

Message:

IPRT/RTPathParseSimple: Root handling fixes. bugref:9586 . ..\..\..\include\iprt\

Location:

trunk/src/VBox/Runtime/common/path

Files:

• RTPathParse.cpp.h (modified) (1 diff)
• RTPathParseSimple.cpp (modified) (4 diffs)

trunk/src/VBox/Runtime/common/path/RTPathParse.cpp.h

@@ -205 +205 @@
                     fProps |= RTPATH_PROP_FILENAME;
 
-                    /* look for an ? */
+                    /* Look for a suffix: */
                     uint32_t offSuffix = offStart + cchComp;
-                    while (offSuffix-- > offStart)
+                    while (--offSuffix > offStart)
                         if (pszPath[offSuffix] == '.')
                         {
                             uint32_t cchSuffix = offStart + cchComp - offSuffix;
-                            if (cchSuffix > 1 && offStart != offSuffix)
+                            if (cchSuffix > 1)
                             {
                                 pParsed->cchSuffix = cchSuffix;

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

@@ -32 +32 @@
 #include <iprt/path.h>
 
+#include <iprt/assert.h>
+#include <iprt/ctype.h>
+
 
 /**
@@ -53 +56 @@
 RTDECL(size_t) RTPathParseSimple(const char *pszPath, size_t *pcchDir, ssize_t *poffName, ssize_t *poffSuff)
 {
-    const char *psz = pszPath;
-    ssize_t     offRoot = 0;
-    const char *pszName = pszPath;
+    /*
+     * First deal with the root as it is always more fun that you'd think.
+     */
+    const char *psz     = pszPath;
+    size_t      cchRoot = 0;
+
+#if RTPATH_STYLE == RTPATH_STR_F_STYLE_DOS
+    if (RT_C_IS_ALPHA(*psz) && RTPATH_IS_VOLSEP(psz[1]))
+    {
+        /* Volume specifier. */
+        cchRoot = 2;
+        psz    += 2;
+    }
+    else if (RTPATH_IS_SLASH(*psz) && RTPATH_IS_SLASH(psz[1]))
+    {
+        /* UNC - there are exactly two prefix slashes followed by a namespace
+           or computer name, which can be empty on windows.  */
+        cchRoot = 2;
+        psz += 2;
+        while (!RTPATH_IS_SLASH(*psz) && *psz)
+        {
+            cchRoot++;
+            psz++;
+        }
+    }
+#endif
+    while (RTPATH_IS_SLASH(*psz))
+    {
+        cchRoot++;
+        psz++;
+    }
+
+    /*
+     * Do the remainder.
+     */
+    const char *pszName = psz;
     const char *pszLastDot = NULL;
-
     for (;; psz++)
     {
         switch (*psz)
         {
+            default:
+                break;
+
             /* handle separators. */
 #if defined(RT_OS_WINDOWS) || defined(RT_OS_OS2)
-            case ':':
-                pszName = psz + 1;
-                offRoot = pszName - psz;
-                break;
-
             case '\\':
 #endif
             case '/':
                 pszName = psz + 1;
+                pszLastDot = NULL;
                 break;
 
@@ -91 +125 @@
                 {
                     ssize_t offSuff = -1;
-                    if (pszLastDot)
+                    if (   pszLastDot
+                        && pszLastDot != pszName
+                        && pszLastDot[1] != '\0')
                     {
                         offSuff = pszLastDot - pszPath;
-                        if (offSuff <= offName)
-                            offSuff = -1;
+                        Assert(offSuff > offName);
                     }
                     *poffSuff = offSuff;
@@ -102 +137 @@
                 if (pcchDir)
                 {
-                    ssize_t off = offName - 1;
-                    while (off >= offRoot && RTPATH_IS_SLASH(pszPath[off]))
-                        off--;
-                    *pcchDir = RT_MAX(off, offRoot) + 1;
+                    size_t cch = offName < 0 ? psz - pszPath : offName - 1 < (ssize_t)cchRoot ? cchRoot : offName - 1;
+                    while (cch > cchRoot && RTPATH_IS_SLASH(pszPath[cch - 1]))
+                        cch--;
+                    *pcchDir = cch;
                 }