Fix ascii_*cmp functions. Problem noted by Brad Thompson.

diff --git a/ascii.c b/ascii.c
index d4553f683012a648a235dfcbcd0be5948e527a6a..59dfb440d27caf99c81ee47330d060362f45a075 100644 (file)
--- a/ascii.c
+++ b/ascii.c
@@ -67,13 +67,13 @@ int ascii_strcasecmp (const char *a, const char *b)
   if (b == NULL && a)
     return 1;
   
-  for (; *a || *b; a++, b++)
+  for (; *a && *b; a++, b++)
   {
     if ((i = ascii_tolower (*a) - ascii_tolower (*b)))
       return i;
   }
-  
-  return 0;
+
+  return ascii_tolower (*a) - ascii_tolower (*b);
 }
 
 int ascii_strncasecmp (const char *a, const char *b, int n)
@@ -87,11 +87,13 @@ int ascii_strncasecmp (const char *a, const char *b, int n)
   if (b == NULL && a)
     return 1;
   
-  for (j = 0; (*a || *b) && j < n; a++, b++, j++)
+  for (j = 0; (*a && *b) && j < n; a++, b++, j++)
   {
     if ((i = ascii_tolower (*a) - ascii_tolower (*b)))
       return i;
   }
-  
-  return 0;
+  if (j < n)
+    return ascii_tolower (*a) - ascii_tolower (*b);
+  else
+    return 0;
 }