Changeset 66361 in vbox for trunk/src/VBox/Runtime/common/string

Timestamp:

Mar 30, 2017 1:44:39 PM (8 years ago)

Author:

vboxsync

Message:

IPRT: Adding RTStrICmpAscii (mirrors RTUtf16ICmpAscii).

File:

• trunk/src/VBox/Runtime/common/string/RTStrICmpAscii.cpp (copied) (copied from trunk/src/VBox/Runtime/common/string/RTUtf16ICmpAscii.cpp ) (1 diff)

trunk/src/VBox/Runtime/common/string/RTStrICmpAscii.cpp

@@ -36 +36 @@
 
 
-RTDECL(int) RTUtf16ICmpAscii(PCRTUTF16 pwsz1, const char *psz2)
+RTDECL(int) RTStrICmpAscii(const char *psz1, const char *psz2)
 {
+    if (psz1 == psz2)
+        return 0;
+    if (!psz1)
+        return -1;
+    if (!psz2)
+        return 1;
+
     for (;;)
     {
-        RTUTF16         wc1  = *pwsz1++;
-        unsigned char   uch2 = *psz2++; Assert(uch2 < 0x80);
-        if (wc1 != uch2)
+        RTUNICP uc1;
+        int rc = RTStrGetCpEx(&psz1, &uc1);
+        if (RT_SUCCESS(rc))
         {
-            if (wc1 >= 0x80)
-                return 1;
-            if (RT_C_TO_LOWER(wc1) != RT_C_TO_LOWER(uch2))
-                return wc1 < uch2 ? -1 : 1;
+            unsigned char uch2 = *psz2++; Assert(uch2 < 0x80);
+
+            /* compare */
+            int iDiff = uc1 - uch2;
+            if (iDiff)
+            {
+                if (uc1 >= 0x80)
+                    return 1;
+
+                iDiff = RT_C_TO_LOWER(uc1) - RT_C_TO_LOWER(uch2); /* Return lower cased diff! */
+                if (iDiff)
+                    return iDiff;
+            }
+
+            if (uch2)
+            { /* likely */ }
+            else
+                return 0;
         }
-        if (!uch2)
-            return 0;
+        /* Hit some bad encoding, continue in case sensitive mode. */
+        else
+            return RTStrCmp(psz1 - 1, psz2);
     }
 }
-RT_EXPORT_SYMBOL(RTUtf16ICmpAscii);
+RT_EXPORT_SYMBOL(RTStrICmpAscii);