Mark Robson noticed that our strcasecmp() behaviour was not

standards compliant.  Brian Stafford then provided these new
implementations, which apprear to properly follow SUSv2.
 -Erik

diff --git a/libc/string/strcasecmp.c b/libc/string/strcasecmp.c
index 0ec81f6..e0d1117 100644 (file)
--- a/libc/string/strcasecmp.c
+++ b/libc/string/strcasecmp.c
@@ -6,16 +6,16 @@
 #include <string.h>
 #include <ctype.h>
 
-int strcasecmp( const char *s, const char *d)
+int strcasecmp (const char *a, const char *b)
 {
-       for (;;) {
-               if (*s != *d) {
-                       if (tolower(*s) != tolower(*d))
-                               return *s - *d;
-               } else if (*s == '\0')
-                       break;
-               s++;
-               d++;
-       }
-       return 0;
+    register int n;
+
+    while (*a == *b || (n = tolower (*a) - tolower (*b)) == 0)
+    {
+       if (*a == '\0')
+           return 0;
+       a++, b++;
+    }
+    return n;
 }
+

diff --git a/libc/string/strncasecmp.c b/libc/string/strncasecmp.c
index ba73e6f..a1bb155 100644 (file)
--- a/libc/string/strncasecmp.c
+++ b/libc/string/strncasecmp.c
@@ -6,17 +6,18 @@
 #include <string.h>
 #include <ctype.h>
 
-int strncasecmp( const char *s, const char *d, size_t l)
+int strncasecmp (const char *a, const char *b, size_t len)
 {
-       while (l > 0) {
-               if (*s != *d) {
-                       if (tolower(*s) != tolower(*d))
-                               return *s - *d;
-               } else if (*s == '\0')
-                       return 0;
-               s++;
-               d++;
-               l--;
-       }
+    register int n;
+
+    if (len < 1)
        return 0;
+    while (*a == *b || (n = tolower (*a) - tolower (*b)) == 0)
+    {
+       if (*a == '\0' || --len < 1)
+           return 0;
+       a++, b++;
+    }
+    return n;
 }
+