Changeset 3762

Timestamp:

Mar 15, 2012, 2:40:59 AM (13 years ago)

Author:

bird

Message:

wcsncmp,wcscmp: don't assume that wchar_t is the same as int. Would cause two extra bytes to be compared on mismatch. Fixes #219.

Location:

trunk/libc/src/fbsdlibc/string

Files:

• wcscmp.c (modified) (2 diffs)
• wcsncmp.c (modified) (2 diffs)

trunk/libc/src/fbsdlibc/string/wcscmp.c

@@ -54 +54 @@
         const wchar_t *s1, *s2;
 {
-
+#if 0 /* bird: Original FreeBSD code */
         while (*s1 == *s2++)
                 if (*s1++ == 0)
@@ -60 +60 @@
         /* XXX assumes wchar_t = int */
         return (*(const unsigned int *)s1 - *(const unsigned int *)--s2);
+#else /* bird: Should be safe and correct for all wchar_t types. */
+        wchar_t wc1;
+        while ((wc1 = *s1) == *s2)
+        {
+                if (!wc1)
+                        return 0;
+                s1++;
+                s2++;
+        }
+        return wc1 < *s2 ? -1 : 1;
+#endif
 }

trunk/libc/src/fbsdlibc/string/wcsncmp.c

@@ -49 +49 @@
         size_t n;
 {
-
+#if 0 /* Original FreeBSD code. */
         if (n == 0)
                 return (0);
@@ -61 +61 @@
                         break;
         } while (--n != 0);
+#else /* bird: Should be safe and correct for all wchar_t types. */
+        while (n > 0)
+        {
+                wchar_t wc1 = *s1;
+                if (wc1 != *s2)
+                        return wc1 < *s2 ? -1 : 1;
+                if (!wc1)
+                        break;
+                s2++;
+                s1++;
+                n--;
+        }
+#endif
         return (0);
 }