儲存庫 vbox 的更動 18552

時間撮記:

2009-3-30 下午02:46:47 (16 年 以前)

作者:

vboxsync

訊息:

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

位置:

trunk

檔案:

• include/iprt/string.h (修改) (2 筆差異)
• src/VBox/Runtime/common/string/utf-8.cpp (修改) (1 筆差異)

trunk/include/iprt/string.h

@@ -884 +884 @@
 
 /**
+ * Locates a case insensitive substring.
+ *
+ * If any of the two strings are NULL, then NULL is returned. If the needle is
+ * an empty string, then the haystack is returned (i.e. matches anything).
+ *
+ * @returns Pointer to the first occurance of the substring if found, NULL if
+ *          not.
+ *
+ * @param   pszHaystack The string to search.
+ * @param   pszNeedle   The substring to search for.
+ *
+ * @remarks The difference between this and strstr is the handling of NULL
+ *          pointers.s
+ */
+RTDECL(char *) RTStrStr(const char *pszHaystack, const char *pszNeedle);
+
+/**
+ * Locates a case insensitive substring.
+ *
+ * If any of the two strings are NULL, then NULL is returned. If the needle is
+ * an empty string, then the haystack is returned (i.e. matches anything).
+ *
+ * @returns Pointer to the first occurance of the substring if found, NULL if
+ *          not.
+ *
+ * @param   pszHaystack The string to search.
+ * @param   pszNeedle   The substring to search for.
+ *
+ */
+RTDECL(char *) RTStrIStr(const char *pszHaystack, const char *pszNeedle);
+
+/**
+ * Converts the string to lower case.
+ *
+ * @returns Pointer to the converted string.
+ * @param   psz     The string to convert.
+ */
+RTDECL(char *) RTStrToLower(char *psz);
+
+/**
+ * Converts the string to upper case.
+ *
+ * @returns Pointer to the converted string.
+ * @param   psz     The string to convert.
+ */
+RTDECL(char *) RTStrToUpper(char *psz);
+
+/**
  * Find the length of a zero-terminated byte string, given
  * a max string length.
@@ -969 +1017 @@
                                           const char *pszString, size_t cchString,
                                           size_t *poffPattern);
-
-/**
- * Converts the string to lower case.
- *
- * @returns Pointer to the converted string.
- * @param   psz     The string to convert.
- */
-RTDECL(char *) RTStrToLower(char *psz);
-
-/**
- * Converts the string to upper case.
- *
- * @returns Pointer to the converted string.
- * @param   psz     The string to convert.
- */
-RTDECL(char *) RTStrToUpper(char *psz);
 
 

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)
 {