(memcoll): Set errno = 0 in the shortcut case, too.

diff --git a/lib/ChangeLog b/lib/ChangeLog
index 0dcf3d23ff7b7115db2cede9b0bc72b2612fcdea..d90fa93614eec85f88ff6e11ce8af12b7cb35b4d 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,9 @@
+2006-08-16  Paul Eggert  <eggert@cs.ucla.edu>
+
+       * memcoll.c (memcoll): Set errno = 0 in the shortcut case, too.
+       Problem and fix reported by Pádraig Brady in
+       <http://lists.gnu.org/archive/html/bug-coreutils/2006-08/msg00099.html>.
+
 2006-08-15  Paul Eggert  <eggert@cs.ucla.edu>
 
        * memcoll.c (memcoll): Optimize for the common case where the

diff --git a/lib/memcoll.c b/lib/memcoll.c
index 7f61a6b58cb25e8577f6df7744fa38d37889b35e..457d1104a93c9093d67875e123fcff1a850b7273 100644 (file)
--- a/lib/memcoll.c
+++ b/lib/memcoll.c
@@ -43,7 +43,10 @@ memcoll (char *s1, size_t s1len, char *s2, size_t s2len)
      the buffers using strcoll on each substring.  */
 
   if (s1len == s2len && memcmp (s1, s2, s1len) == 0)
-    diff = 0;
+    {
+      errno = 0;
+      diff = 0;
+    }
   else
     {
       char n1 = s1[s1len];