X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fmemcasecmp.c;h=7cb427234107dc3dc0b958a222f9b29fb8a93c90;hb=c1ebd28b04d9ecf3abc3fe980eaaac13456ba51e;hp=547902895d15a9ba005a46dcd08eb251b1cd6b66;hpb=821438b9a84381b4128ca5bf9a6b18d3c680feb3;p=gnulib.git

diff --git a/lib/memcasecmp.c b/lib/memcasecmp.c
index 547902895..7cb427234 100644
--- a/lib/memcasecmp.c
+++ b/lib/memcasecmp.c
@@ -1,32 +1,60 @@
-#ifdef HAVE_CONFIG_H
+/* Case-insensitive buffer comparator.
+   Copyright (C) 1996, 1997, 2000, 2003 Free Software Foundation, Inc.
+
+   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.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   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.  */
+
+/* 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 TOLOWER(c) tolower (c)
+# define TOUPPER(Char) toupper (Char)
 #else
-# define TOLOWER(c) (ISUPPER (c) ? tolower (c) : (c))
+# define TOUPPER(Char) (ISLOWER (Char) ? toupper (Char) : (Char))
 #endif
 
 #include "memcasecmp.h"
 
-/* Like memcmp, but ignore differences in case.  */
+/* Like memcmp, but ignore differences in case.
+   Convert to upper case (not lower) before comparing so that
+   join -i works with sort -f.  */
 
 int
 memcasecmp (const void *vs1, const void *vs2, size_t n)
 {
-  unsigned int i;
-  unsigned char *s1 = (unsigned char *) vs1;
-  unsigned char *s2 = (unsigned char *) 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 (TOLOWER (u1) != TOLOWER (u2))
-        return TOLOWER (u1) - TOLOWER (u2);
+      unsigned char u1 = s1[i];
+      unsigned char u2 = s2[i];
+      int diff = TOUPPER (u1) - TOUPPER (u2);
+      if (diff)
+	return diff;
     }
   return 0;
 }