Changeset 14324 in vbox for trunk

Timestamp:

Nov 18, 2008 7:09:34 PM (16 years ago)

Author:

vboxsync

Message:

RTPathStripFilename root fix.

Location:

trunk/src/VBox/Runtime

Files:

• r3/path.cpp (modified) (5 diffs)
• testcase/tstPath.cpp (modified) (3 diffs)

trunk/src/VBox/Runtime/r3/path.cpp

@@ -51 +51 @@
  *
  * @param   pszPath     Path which filename should be extracted from.
+ *                      If only filename in the string a '.' will be returned.
  *
  */
@@ -56 +57 @@
 {
     char *psz = pszPath;
-    char *pszLastSep = pszPath;
+    char *pszLastSep = NULL;
+
 
     for (;; psz++)
@@ -66 +68 @@
             case ':':
                 pszLastSep = psz + 1;
+                if (RTPATH_IS_SLASH(psz[1]))
+                    pszPath = psz + 1;
+                else
+                    pszPath = psz;
                 break;
 
@@ -76 +82 @@
             /* the end */
             case '\0':
-                if (pszLastSep == pszPath)
-                    *pszLastSep++ = '.';
-                *pszLastSep = '\0';
+                if (!pszLastSep)
+                {
+                    /* no directory component */
+                    pszPath[0] = '.';
+                    pszPath[1] = '\0';
+                }
+                else if (pszLastSep == pszPath)
+                {
+                    /* only root. */
+                    pszLastSep[1] = '\0';
+                }
+                else
+                    pszLastSep[0] = '\0';
                 return;
         }
@@ -253 +269 @@
  *
  * @param   pszPath     Path to strip.
+ *
+ * @todo    This isn't safe for a root element! Needs fixing.
  */
 RTDECL(void) RTPathStripTrailingSlash(char *pszPath)

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

@@ -36 +36 @@
 #include <iprt/initterm.h>
 #include <iprt/stream.h>
+#include <iprt/string.h>
 #include <iprt/err.h>
 #include <iprt/param.h>
@@ -120 +121 @@
         "\\temp",                       "\\data",
 #endif
-        };
+    };
 
     for (unsigned i = 0; i < RT_ELEMENTS(aInput); i += 2)
@@ -131 +132 @@
 
     /*
+     * RTPathStripFilename
+     */
+    RTPrintf("tstPath: RTPathStripFilename...\n");
+    static const char *apszStripFilenameTests[] =
+    {
+        "/usr/include///",              "/usr/include//",
+        "/usr/include/",                "/usr/include",
+        "/usr/include",                 "/usr",
+        "/usr",                         "/",
+        "usr",                          ".",
+#if defined (RT_OS_OS2) || defined (RT_OS_WINDOWS)
+        "c:/windows",                   "c:/",
+        "c:/",                          "c:/",
+        "D:",                           "D:",
+        "C:\\OS2\\DLLS",                "C:\\OS2",
+#endif
+    };
+    for (unsigned i = 0; i < RT_ELEMENTS(apszStripFilenameTests); i += 2)
+    {
+        const char *pszInput  = apszStripFilenameTests[i];
+        const char *pszExpect = apszStripFilenameTests[i + 1];
+        char szPath[RTPATH_MAX];
+        strcpy(szPath, pszInput);
+        RTPathStripFilename(szPath);
+        if (strcmp(szPath, pszExpect))
+        {
+            RTPrintf("tstPath: RTPathStripFilename failed!\n"
+                     "   input: '%s'\n"
+                     "  output: '%s'\n"
+                     "expected: '%s'\n",
+                     pszInput, szPath, pszExpect);
+            cErrors++;
+        }
+    }
+
+    /*
      * Summary.
      */
     if (!cErrors)
-        RTPrintf("tstTimer: SUCCESS\n");
+        RTPrintf("tstPath: SUCCESS\n");
     else
-        RTPrintf("tstTimer: FAILURE %d errors\n", cErrors);
+        RTPrintf("tstPath: FAILURE %d errors\n", cErrors);
     return !!cErrors;
 }