From 45d311ec0b6f52837cd256947672d46eaf4859fc Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Tue, 31 Dec 2002 22:11:34 +0000 Subject: [PATCH] (memcoll): Fall back on a simple algorithm using memcmp if strcoll doesn't work. --- lib/memcoll.c | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/lib/memcoll.c b/lib/memcoll.c index e1b884efb..49eccdad2 100644 --- a/lib/memcoll.c +++ b/lib/memcoll.c @@ -1,5 +1,5 @@ /* Locale-specific memory comparison. - Copyright 1999, 2002 Free Software Foundation, Inc. + Copyright (C) 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 @@ -32,29 +32,25 @@ extern int errno; # include #endif -/* Use strcoll() only if it really works. */ -#if HAVE_STRCOLL -# define STRCOLL strcoll -#else -# define STRCOLL strcmp -#endif - /* 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. Set errno to an + 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 (! (errno = 0, (diff = STRCOLL (s1, s2)) || errno)) + 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 @@ -82,5 +78,13 @@ 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; + +#endif + return diff; } -- 2.11.0