X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fstrncasecmp.c;h=584ddadbafaf47049ab29bfb397b2dadcd51067d;hb=7272990957a8aa5559b3b8f95e319bbcedd9f140;hp=039be0dbbe8f16caeb5f70479fdb039643d0fc69;hpb=25a832363606f0a9f987f9242265a5e6e1259228;p=gnulib.git
diff --git a/lib/strncasecmp.c b/lib/strncasecmp.c
index 039be0dbb..584ddadba 100644
--- a/lib/strncasecmp.c
+++ b/lib/strncasecmp.c
@@ -1,4 +1,5 @@
-/* Copyright (C) 1998 Free Software Foundation, Inc.
+/* strncasecmp.c -- case insensitive string comparator
+ Copyright (C) 1998-1999, 2005-2007, 2009-2012 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
@@ -11,22 +12,22 @@
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 . */
-#if HAVE_CONFIG_H
-# include
-#endif
+#include
+
+/* Specification. */
+#include
-#include
#include
+#include
#define TOLOWER(Ch) (isupper (Ch) ? tolower (Ch) : (Ch))
-/* Compare no more than N characters of strings S1 and S2,
- ignoring case, returning less than, equal to or
- greater than zero if S1 is lexicographically less
- than, equal to or greater than S2. */
+/* Compare no more than N bytes of strings S1 and S2, ignoring case,
+ returning less than, equal to or greater than zero if S1 is
+ lexicographically less than, equal to or greater than S2.
+ Note: This function cannot work correctly in multibyte locales. */
int
strncasecmp (const char *s1, const char *s2, size_t n)
@@ -40,13 +41,22 @@ strncasecmp (const char *s1, const char *s2, size_t n)
do
{
- c1 = TOLOWER (*p1++);
- c2 = TOLOWER (*p2++);
+ c1 = TOLOWER (*p1);
+ c2 = TOLOWER (*p2);
if (--n == 0 || c1 == '\0')
- break;
+ break;
+
+ ++p1;
+ ++p2;
}
while (c1 == c2);
- return c1 - c2;
+ if (UCHAR_MAX <= INT_MAX)
+ return c1 - c2;
+ else
+ /* On machines where 'char' and 'int' are types of the same size, the
+ difference of two 'unsigned char' values - including the sign bit -
+ doesn't fit in an 'int'. */
+ return (c1 > c2 ? 1 : c1 < c2 ? -1 : 0);
}