X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fmemcasecmp.c;h=4873651b3f76d5abd8afb88167268c1015f2531e;hb=6a9b156fdf9c71c0bbc8bb0b3aa0262df5674dda;hp=00519f51ad549038b3459aad1639bc8ca4ed4a04;hpb=267a39bafd249d7eb9c37df06dc6defcf41cb343;p=gnulib.git
diff --git a/lib/memcasecmp.c b/lib/memcasecmp.c
index 00519f51a..4873651b3 100644
--- a/lib/memcasecmp.c
+++ b/lib/memcasecmp.c
@@ -1,10 +1,10 @@
/* Case-insensitive buffer comparator.
- Copyright (C) 1996, 1997, 2000, 2003 Free Software Foundation, Inc.
+ Copyright (C) 1996, 1997, 2000, 2003, 2006 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,32 +12,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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+ along with this program. If not, see . */
/* Written by Jim Meyering. */
-#if HAVE_CONFIG_H
-# include
-#endif
-
-#include
-
-#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
#include "memcasecmp.h"
+#include
+#include
+
/* Like memcmp, but ignore differences in case.
Convert to upper case (not lower) before comparing so that
join -i works with sort -f. */
@@ -52,7 +37,10 @@ memcasecmp (const void *vs1, const void *vs2, size_t n)
{
unsigned char u1 = s1[i];
unsigned char u2 = s2[i];
- int diff = TOUPPER (u1) - TOUPPER (u2);
+ 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;
}