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

Timestamp:

Mar 30, 2009 2:46:47 PM (16 years ago)

Author:

vboxsync

Message:

IPRT: Untested RTStrIStr and RTStrStr. (testcase is underways)

File:

• trunk/src/VBox/Runtime/common/string/utf-8.cpp (modified) (1 diff)

trunk/src/VBox/Runtime/common/string/utf-8.cpp

@@ -1371 +1371 @@
 
 
+RTDECL(char *) RTStrStr(const char *pszHaystack, const char *pszNeedle)
+{
+    /* Any NULL strings means NULL return. (In the RTStrCmp tradition.) */
+    if (!pszHaystack)
+        return NULL;
+    if (!pszNeedle)
+        return NULL;
+
+    /* The rest is CRT. */
+    return strstr(pszHaystack, pszNeedle);
+}
+
+
+RTDECL(char *) RTStrIStr(const char *pszHaystack, const char *pszNeedle)
+{
+    /* Any NULL strings means NULL return. (In the RTStrCmp tradition.) */
+    if (!pszHaystack)
+        return NULL;
+    if (!pszNeedle)
+        return NULL;
+
+    /* The empty string matches everything. */
+    if (*pszNeedle)
+        return (char *)pszHaystack;
+
+    /*
+     * The search strategy is to pick out the first char of the needle, fold it,
+     * and match it against the haystack code point by code point. When encountering
+     * a matching code point we use RTStrNICmp for the remainder (if any) of the needle.
+     */
+    const char * const pszNeedleStart = pszNeedle;
+    RTUNICP Cp0;
+    RTStrGetCpEx(&pszNeedle, &Cp0);     /* pszNeedle is advanced one code point. */
+    size_t const    cchNeedle   = strlen(pszNeedle);
+    size_t const    cchNeedleCp0= pszNeedle - pszNeedleStart;
+    RTUNICP const   Cp0Lower    = RTUniCpToLower(Cp0);
+    RTUNICP const   Cp0Upper    = RTUniCpToUpper(Cp0);
+    if (    Cp0Lower == Cp0Upper
+        &&  Cp0Lower == Cp0)
+    {
+        /* Cp0 is not a case sensitive char. */
+        for (;;)
+        {
+            RTUNICP Cp;
+            RTStrGetCpEx(&pszHaystack, &Cp);
+            if (!Cp)
+                break;
+            if (    Cp == Cp0
+                &&  !RTStrNICmp(pszHaystack, pszNeedle, cchNeedle))
+                return (char *)pszHaystack - cchNeedleCp0;
+        }
+    }
+    else if (   Cp0Lower == Cp0
+             || Cp0Upper != Cp0)
+    {
+        /* Cp0 is case sensitive */
+        for (;;)
+        {
+            RTUNICP Cp;
+            RTStrGetCpEx(&pszHaystack, &Cp);
+            if (!Cp)
+                break;
+            if (    (   Cp == Cp0Upper
+                     || Cp == Cp0Lower)
+                &&  !RTStrNICmp(pszHaystack, pszNeedle, cchNeedle))
+                return (char *)pszHaystack - cchNeedleCp0;
+        }
+    }
+    else
+    {
+        /* Cp0 is case sensitive and folds to two difference chars. (paranoia) */
+        for (;;)
+        {
+            RTUNICP Cp;
+            RTStrGetCpEx(&pszHaystack, &Cp);
+            if (!Cp)
+                break;
+            if (    (   Cp == Cp0
+                     || Cp == Cp0Upper
+                     || Cp == Cp0Lower)
+                &&  !RTStrNICmp(pszHaystack, pszNeedle, cchNeedle))
+                return (char *)pszHaystack - cchNeedleCp0;
+        }
+    }
+
+
+    return NULL;
+}
+
+
 RTDECL(char *) RTStrToLower(char *psz)
 {