Merge "Add String16#contains and strstr16 methods." into nyc-dev

1 files changed, 26 insertions, 3 deletions

diff --git a/libutils/Unicode.cpp b/libutils/Unicode.cpp
index 6f4b721760..ade896a02d 100644
--- a/libutils/Unicode.cpp
+++ b/libutils/Unicode.cpp
@@ -222,11 +222,16 @@ int strncmp16(const char16_t *s1, const char16_t *s2, size_t n)
   char16_t ch;
   int d = 0;
 
-  while ( n-- ) {
+  if (n == 0) {
+    return 0;
+  }
+
+  do {
     d = (int)(ch = *s1++) - (int)*s2++;
-    if ( d || !ch )
+    if ( d || !ch ) {
       break;
-  }
+    }
+  } while (--n);
 
   return d;
 }
@@ -284,6 +289,24 @@ size_t strnlen16(const char16_t *s, size_t maxlen)
   return ss-s;
 }
 
+char16_t* strstr16(const char16_t* src, const char16_t* target)
+{
+    const char16_t needle = *target++;
+    if (needle != '\0') {
+      do {
+        do {
+          if (*src == '\0') {
+            return nullptr;
+          }
+        } while (*src++ != needle);
+      } while (strcmp16(src, target) != 0);
+      src--;
+    }
+
+    return (char16_t*)src;
+}
+
+
 int strzcmp16(const char16_t *s1, size_t n1, const char16_t *s2, size_t n2)
 {
     const char16_t* e1 = s1+n1;