diff options
Diffstat (limited to 'contrib/gnu-sort/lib/memcoll.c')
| -rw-r--r-- | contrib/gnu-sort/lib/memcoll.c | 26 |
1 files changed, 18 insertions, 8 deletions
diff --git a/contrib/gnu-sort/lib/memcoll.c b/contrib/gnu-sort/lib/memcoll.c index a2decfe..34ae767 100644 --- a/contrib/gnu-sort/lib/memcoll.c +++ b/contrib/gnu-sort/lib/memcoll.c @@ -1,5 +1,5 @@ /* Locale-specific memory comparison. - Copyright 1999, 2002 Free Software Foundation, Inc. + Copyright (C) 1999, 2002, 2003 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 @@ -21,26 +21,27 @@ # include <config.h> #endif +#include "memcoll.h" + #include <errno.h> #ifndef errno extern int errno; #endif -#include <sys/types.h> - -#if HAVE_STRING_H -# include <string.h> -#endif +#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. 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]; @@ -75,5 +76,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; } |
