X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fmemcoll.c;h=d9504b4531c0585c01a61145881192693a42e759;hb=35a32ee9550d22a932f1a71d89653e351405638d;hp=09f9f2dd133040dc0288c2552c2ed93fa9967ef8;hpb=89f2b4892655a929a506eff123c9126a88e2c8eb;p=gnulib.git

diff --git a/lib/memcoll.c b/lib/memcoll.c
index 09f9f2dd1..d9504b453 100644
--- a/lib/memcoll.c
+++ b/lib/memcoll.c
@@ -1,5 +1,5 @@
 /* Locale-specific memory comparison.
-   Copyright 1999 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002, 2003, 2004 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
@@ -13,7 +13,7 @@
 
    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.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Contributed by Paul Eggert <eggert@twinsun.com>.  */
 
@@ -21,25 +21,30 @@
 # include <config.h>
 #endif
 
-#if HAVE_STRING_H
-# include <string.h>
-#endif
+#include "memcoll.h"
+
+#include <errno.h>
+#include <string.h>
 
 /* Compare S1 (with length S1LEN) and S2 (with length S2LEN) according
    to the LC_COLLATE locale.  S1 and S2 do not overlap, and are not
-   adjacent.  Temporarily modify the bytes after S1 and S2, but
-   restore their original contents before returning.  */
+   adjacent.  Perhaps temporarily modify the bytes after S1 and S2,
+   but restore their original contents before returning.  Set errno to an
+   error number if there is an error, and to zero otherwise.  */
 int
 memcoll (char *s1, size_t s1len, char *s2, size_t s2len)
 {
   int diff;
+
+#if HAVE_STRCOLL
+
   char n1 = s1[s1len];
   char n2 = s2[s2len];
 
   s1[s1len++] = '\0';
   s2[s2len++] = '\0';
 
-  while (! (diff = strcoll (s1, s2)))
+  while (! (errno = 0, (diff = strcoll (s1, s2)) || errno))
     {
       /* strcoll found no difference, but perhaps it was fooled by NUL
 	 characters in the data.  Work around this problem by advancing
@@ -67,5 +72,14 @@ memcoll (char *s1, size_t s1len, char *s2, size_t s2len)
   s1[s1len - 1] = n1;
   s2[s2len - 1] = n2;
 
+#else
+
+  diff = memcmp (s1, s2, s1len < s2len ? s1len : s2len);
+  if (! diff)
+    diff = s1len < s2len ? -1 : s1len != s2len;
+  errno = 0;
+
+#endif
+
   return diff;
 }