X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fmemcasecmp.c;h=6ae7c4f65dd0f742ee99139ddd95bada304456eb;hb=cbfeef01ad4ed6d3f68c3deb3c05d3b8102c84ff;hp=18dd31f6e496d35579a0ebdf85f0f6deb78ca909;hpb=2c6dd019d311dfb8c1ac8135dcfb41f46f75e8a7;p=gnulib.git

diff --git a/lib/memcasecmp.c b/lib/memcasecmp.c
index 18dd31f6e..6ae7c4f65 100644
--- a/lib/memcasecmp.c
+++ b/lib/memcasecmp.c
@@ -1,10 +1,11 @@
 /* Case-insensitive buffer comparator.
-   Copyright (C) 1996, 1997, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1996-1997, 2000, 2003, 2006, 2009-2011 Free Software
+   Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -12,33 +13,17 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* Written by Jim Meyering.  */
 
-#if HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include <sys/types.h>
-#include <ctype.h>
-
-#if defined (STDC_HEADERS) || (!defined (isascii) && !defined (HAVE_ISASCII))
-# define IN_CTYPE_DOMAIN(Char) 1
-#else
-# define IN_CTYPE_DOMAIN(Char) isascii(Char)
-#endif
-#define ISLOWER(Char) (IN_CTYPE_DOMAIN (Char) && islower (Char))
-
-#if _LIBC || STDC_HEADERS
-# define TOUPPER(Char) toupper (Char)
-#else
-# define TOUPPER(Char) (ISLOWER (Char) ? toupper (Char) : (Char))
-#endif
+#include <config.h>
 
 #include "memcasecmp.h"
 
+#include <ctype.h>
+#include <limits.h>
+
 /* Like memcmp, but ignore differences in case.
    Convert to upper case (not lower) before comparing so that
    join -i works with sort -f.  */
@@ -46,15 +31,19 @@
 int
 memcasecmp (const void *vs1, const void *vs2, size_t n)
 {
-  unsigned int i;
-  unsigned char const *s1 = (unsigned char const *) vs1;
-  unsigned char const *s2 = (unsigned char const *) vs2;
+  size_t i;
+  char const *s1 = vs1;
+  char const *s2 = vs2;
   for (i = 0; i < n; i++)
     {
-      unsigned char u1 = *s1++;
-      unsigned char u2 = *s2++;
-      if (TOUPPER (u1) != TOUPPER (u2))
-        return TOUPPER (u1) - TOUPPER (u2);
+      unsigned char u1 = s1[i];
+      unsigned char u2 = s2[i];
+      int U1 = toupper (u1);
+      int U2 = toupper (u2);
+      int diff = (UCHAR_MAX <= INT_MAX ? U1 - U2
+                  : U1 < U2 ? -1 : U2 < U1);
+      if (diff)
+        return diff;
     }
   return 0;
 }