X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fstrncasecmp.c;h=29cd1e7e5eab4851407695de255801757bf00a66;hb=cd56634a4a8179fd5a4419fbb3e27211b042ab1c;hp=4e57debf51a9f46b8b5397ec43231a36b55c2b2d;hpb=5516de90cec9ff3c9aead77fd8b6e54b4ec3b1c3;p=gnulib.git
diff --git a/lib/strncasecmp.c b/lib/strncasecmp.c
index 4e57debf5..29cd1e7e5 100644
--- a/lib/strncasecmp.c
+++ b/lib/strncasecmp.c
@@ -1,5 +1,5 @@
/* strncasecmp.c -- case insensitive string comparator
- Copyright (C) 1998, 1999 Free Software Foundation, Inc.
+ Copyright (C) 1998-1999, 2005-2007, 2009-2014 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
@@ -12,24 +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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+ along with this program; if not, see . */
-#if HAVE_CONFIG_H
-# include
-#endif
+#include
/* Specification. */
-#include "strcase.h"
+#include
#include
+#include
#define TOLOWER(Ch) (isupper (Ch) ? tolower (Ch) : (Ch))
-/* 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. */
+/* 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)
@@ -47,12 +45,18 @@ strncasecmp (const char *s1, const char *s2, size_t n)
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);
}