*** empty log message ***

[gnulib.git] / lib / memcoll.c

diff --git a/lib/memcoll.c b/lib/memcoll.c
index 11a61ad..a2decfe 100644 (file)
--- a/lib/memcoll.c
+++ b/lib/memcoll.c
@@ -1,5 +1,5 @@
 /* Locale-specific memory comparison.
 /* Locale-specific memory comparison.

-   Copyright 1999 Free Software Foundation, Inc.
+   Copyright 1999, 2002 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
 
    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


@@ -21,62 +21,33 @@
 # include <config.h>
 #endif
 
 # include <config.h>
 #endif
 

-#ifndef __GNUC__
-# ifdef HAVE_ALLOCA_H
-#  include <alloca.h>
-# else
-#  ifdef _AIX
- #  pragma alloca
-#  else
-#   ifdef _WIN32
-#    include <malloc.h>
-#    include <io.h>
-#   else
-#    ifndef alloca
-char *alloca ();
-#    endif
-#   endif
-#  endif
-# endif
+#include <errno.h>
+#ifndef errno
+extern int errno;

 #endif
 
 #endif
 

+#include <sys/types.h>
+

 #if HAVE_STRING_H
 # include <string.h>
 #endif
 
 /* Compare S1 (with length S1LEN) and S2 (with length S2LEN) according
 #if HAVE_STRING_H
 # include <string.h>
 #endif
 
 /* Compare S1 (with length S1LEN) and S2 (with length S2LEN) according

-   to the LC_COLLATE locale.  S1 and S2 do not overlap, but may be
+   to the LC_COLLATE locale.  S1 and S2 do not overlap, and are not

    adjacent.  Temporarily modify the bytes after S1 and S2, but
    adjacent.  Temporarily modify the bytes after S1 and S2, but

-   restore their original contents before returning.  */
+   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;
 int
 memcoll (char *s1, size_t s1len, char *s2, size_t s2len)
 {
   int diff;

-  char n1;
-  char n2;
-
-  /* We will temporarily set the bytes after S1 and S2 to zero, so if
-     S1 and S2 are adjacent, compare to a temporary copy of the
-     earlier, to avoid temporarily stomping on the later.  */
-
-  if (s1 + s1len == s2)
-    {
-      char *s2copy = alloca (s2len + 1);
-      memcpy (s2copy, s2, s2len);
-      s2 = s2copy;
-    }
-
-  if (s2 + s2len == s1)
-    {
-      char *s1copy = alloca (s1len + 1);
-      memcpy (s1copy, s1, s1len);
-      s1 = s1copy;
-    }
+  char n1 = s1[s1len];
+  char n2 = s2[s2len];

 
 

-  n1 = s1[s1len];  s1[s1len++] = '\0';
-  n2 = s2[s2len];  s2[s2len++] = '\0';
+  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
     {
       /* strcoll found no difference, but perhaps it was fooled by NUL
         characters in the data.  Work around this problem by advancing