From ce4b0fa7e84539992a0cccb618c4fc9d9cfabc50 Mon Sep 17 00:00:00 2001 From: Eric Andersen Date: Tue, 12 Feb 2002 20:28:12 +0000 Subject: 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 --- libc/string/strcasecmp.c | 22 +++++++++++----------- libc/string/strncasecmp.c | 23 ++++++++++++----------- 2 files changed, 23 insertions(+), 22 deletions(-) diff --git a/libc/string/strcasecmp.c b/libc/string/strcasecmp.c index 0ec81f641..e0d11170a 100644 --- a/libc/string/strcasecmp.c +++ b/libc/string/strcasecmp.c @@ -6,16 +6,16 @@ #include #include -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 ba73e6f09..a1bb15574 100644 --- a/libc/string/strncasecmp.c +++ b/libc/string/strncasecmp.c @@ -6,17 +6,18 @@ #include #include -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; } + -- cgit v1.2.3