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

Timestamp:

Jan 6, 2019 7:11:08 PM (6 years ago)

Author:

vboxsync

Message:

RTPathCalcRelative: Extended case-insensitivity from 7-bit ascii to full unicode.

Location:

trunk/src/VBox/Runtime

Files:

• common/path/RTPathCalcRelative.cpp (modified) (4 diffs)
• testcase/tstRTPath.cpp (modified) (1 diff)

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

@@ -33 +33 @@
 
 #include <iprt/assert.h>
-#if RTPATH_STYLE == RTPATH_STR_F_STYLE_DOS
-# include <iprt/ctype.h>
-#endif
 #include <iprt/errcore.h>
 #include <iprt/string.h>
+#if RTPATH_STYLE == RTPATH_STR_F_STYLE_DOS
+# include <iprt/uni.h>
+#endif
 #include "internal/path.h"
 
+
+#if RTPATH_STYLE == RTPATH_STR_F_STYLE_DOS
+/** Helper for doing case insensitive comparison of a mismatching codepoint. */
+DECLINLINE(bool) rtPathCalcRelativeEqualICaseCodepoint(const char *pszPathFromStart, const char *pszPathFrom,
+                                                       const char *pszPathToStart,   const char *pszPathTo)
+{
+    RTUNICP ucFrom = RTStrGetCp(RTStrPrevCp(pszPathFromStart, pszPathFrom));
+    RTUNICP ucTo   = RTStrGetCp(RTStrPrevCp(pszPathToStart,   pszPathTo));
+    return ucFrom == ucTo
+        || RTUniCpToLower(ucFrom) == RTUniCpToLower(ucTo)
+        || RTUniCpToUpper(ucFrom) == RTUniCpToUpper(ucTo);
+}
+#endif
 
 
@@ -50 +63 @@
     AssertPtrReturn(pszPathFrom, VERR_INVALID_POINTER);
     AssertPtrReturn(pszPathTo, VERR_INVALID_POINTER);
+#if RTPATH_STYLE == RTPATH_STR_F_STYLE_DOS
+    const char * const pszPathFromStart = pszPathFrom;
+    const char * const pszPathToStart   = pszPathTo;
+#endif
 
     /*
@@ -70 +87 @@
 #else
     if (RTStrNICmp(pszPathFrom, pszPathTo, offRootFrom))
-        for (size_t off = 0; off < offRootFrom; off++)
-        {
-            char const chFrom = pszPathFrom[off];
-            char const chTo   = pszPathTo[off];
-            if (   chFrom != chTo
-                && RT_C_TO_LOWER(chFrom) != RT_C_TO_LOWER(chTo) /** @todo proper case insensitivity! */
-                && (!RTPATH_IS_SLASH(chFrom) || !RTPATH_IS_SLASH(chTo)) )
+    {
+        const char *pszFromCursor = pszPathFrom;
+        const char *pszToCursor   = pszPathTo;
+        while ((size_t)(pszFromCursor - pszPathFrom) < offRootFrom)
+        {
+            RTUNICP ucFrom;
+            int rc = RTStrGetCpEx(&pszFromCursor, &ucFrom);
+            AssertRCReturn(rc, rc);
+
+            RTUNICP ucTo;
+            rc = RTStrGetCpEx(&pszToCursor, &ucTo);
+            AssertRCReturn(rc, rc);
+            if (   ucFrom != ucTo
+                && RTUniCpToLower(ucFrom) != RTUniCpToLower(ucTo)
+                && RTUniCpToUpper(ucFrom) != RTUniCpToUpper(ucTo)
+                && (!RTPATH_IS_SLASH(ucFrom) || !RTPATH_IS_SLASH(ucTo)) )
                 return VERR_NOT_SUPPORTED;
         }
+    }
 #endif
 
@@ -120 +147 @@
             }
 #if RTPATH_STYLE == RTPATH_STR_F_STYLE_DOS
-            else if (RT_C_TO_LOWER(chFrom) == RT_C_TO_LOWER(chTo))
+            else if (rtPathCalcRelativeEqualICaseCodepoint(pszPathFromStart, pszPathFrom + 1, pszPathToStart, pszPathTo + 1))
             { /* if not likely, then simpler code structure wise. */ }
 #endif

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

@@ -763 +763 @@
         { "c:\\dir\\test.ext",  true,           "f:\\dir\\test.ext",      VERR_NOT_SUPPORTED, "" },
         { "F:\\dir\\test.ext",  false,          "f:/dir//test.ext",      VINF_SUCCESS, "." } ,
-        { "F:\\dir\\test.ext",  true,           "f:/dir//test.ext",      VINF_SUCCESS, "test.ext" } ,
+        { "F:\\diR\\Test.exT",  true,           "f:/dir//test.ext",      VINF_SUCCESS, "Test.exT" } ,
+        { "F:\\K\xc3\x85RE\\Test.exT", true,    "f:/k\xc3\xa5re//test.ext", VINF_SUCCESS, "Test.exT" } ,
 #endif
     };