Changeset 25923 in vbox for trunk/src/VBox

Timestamp:

Jan 20, 2010 11:06:27 AM (15 years ago)

Author:

vboxsync

Message:

RTPathStripTrailingSlash: testcase + extensions.

Location:

trunk/src/VBox/Runtime

Files:

• common/path/RTPathStripTrailingSlash.cpp (modified) (2 diffs)
• testcase/tstPath.cpp (modified) (2 diffs)

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2007 Sun Microsystems, Inc.
+ * Copyright (C) 2006-2010 Sun Microsystems, Inc.
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -36 +36 @@
 #include <iprt/path.h>
 #include <iprt/string.h>
+#include <iprt/ctype.h>
 
 
 
-/**
- * Strips the trailing slashes of a path name.
- *
- * @param   pszPath     Path to strip.
- *
- * @todo    This isn't safe for a root element! Needs fixing.
- */
-RTDECL(void) RTPathStripTrailingSlash(char *pszPath)
+RTDECL(size_t) RTPathStripTrailingSlash(char *pszPath)
 {
-    char *pszEnd = strchr(pszPath, '\0');
-    while (pszEnd-- > pszPath)
+    size_t off = strlen(pszPath);
+    while (off > 1)
     {
-        switch (*pszEnd)
+        off--;
+        switch (pszPath[off])
         {
             case '/':
 #if defined(RT_OS_WINDOWS) || defined(RT_OS_OS2)
             case '\\':
+                if (    off == 2
+                    &&  pszPath[1] == ':'
+                    &&  RT_C_IS_ALPHA(pszPath[0]))
+                    return cch + 1;
 #endif
-                *pszEnd = '\0';
+                pszPath[off] = '\0';
                 break;
+
             default:
-                return;
+                return off + 1;
         }
     }
-    return;
+
+    return 1;
 }
 

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2007 Sun Microsystems, Inc.
+ * Copyright (C) 2006-2010 Sun Microsystems, Inc.
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -330 +330 @@
     }
 
-
+    /*
+     * RTPathStripTrailingSlash
+     */
+    static const char *s_apszStripTrailingSlash[] =
+    {
+     /* input                   result */
+        "/",                    "/",
+        "//",                   "/",
+        "////////////////////", "/",
+        "/tmp",                 "/tmp",
+        "/tmp////////////////", "/tmp",
+        "tmp",                  "tmp",
+        "tmp////////////////",  "tmp",
+        "./",                   ".",
+#if defined (RT_OS_OS2) || defined (RT_OS_WINDOWS)
+        "////////////////////", "/",
+        "D:",                   "D:",
+        "D:/",                  "D:/",
+        "D:\\",                 "D:\\",
+        "D:\\/\\",              "D:\\",
+        "D:/\\/\\",             "D:/",
+        "C:/Temp",              "D:/Temp",
+        "C:/Temp/",             "D:/Temp/",
+        "C:/Temp\\/",           "D:/Temp",
+#endif
+    };
+    for (unsigned i = 0; i < RT_ELEMENTS(s_apszStripTrailingSlash); i += 2)
+    {
+        const char *pszInput  = s_apszStripTrailingSlash[i];
+        const char *pszExpect = s_apszStripTrailingSlash[i + 1];
+
+        strcpy(szPath, pszInput);
+        cch = RTPathStripTrailingSlash(szPath);
+        if (strcmp(szPath, pszExpect))
+            RTTestIFailed("Unexpected result\n"
+                          "   input: '%s'\n"
+                          "  output: '%s'\n"
+                          "expected: '%s'",
+                          pszInput, szPath, pszExpect);
+        else
+            RTTESTI_CHECK(cch == strlen(szPath));
+    }
 
     /*