gettimeofday: port recent C++ fix to Emacs

[gnulib.git] / lib / memcasecmp.c

diff --git a/lib/memcasecmp.c b/lib/memcasecmp.c
index 5479028..e85add4 100644 (file)
--- a/lib/memcasecmp.c
+++ b/lib/memcasecmp.c
@@ -1,32 +1,49 @@
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+/* Case-insensitive buffer comparator.
+   Copyright (C) 1996-1997, 2000, 2003, 2006, 2009-2013 Free Software
+   Foundation, Inc.
 
-#include <sys/types.h>
-#include <ctype.h>
+   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 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
+   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, see <http://www.gnu.org/licenses/>.  */
 
-#if _LIBC || STDC_HEADERS
-# define TOLOWER(c) tolower (c)
-#else
-# define TOLOWER(c) (ISUPPER (c) ? tolower (c) : (c))
-#endif
+/* Written by Jim Meyering.  */
+
+#include <config.h>
 
 #include "memcasecmp.h"
 
-/* Like memcmp, but ignore differences in case.  */
+#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.  */
 
 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 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;
 }