X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fxmemcoll.c;h=59d9555b9e412d81375ac1789ff3bc633adb1832;hb=23eecb48e39afd0d267d64d40ba6bf97aa865e13;hp=de00c84447a8d5e6e4f53808f2008453e77a6684;hpb=0632e115747ff96e93330c88f536d7354a7ce507;p=gnulib.git
diff --git a/lib/xmemcoll.c b/lib/xmemcoll.c
index de00c8444..59d9555b9 100644
--- a/lib/xmemcoll.c
+++ b/lib/xmemcoll.c
@@ -1,11 +1,11 @@
/* Locale-specific memory comparison.
- Copyright (C) 2002, 2003, 2004, 2006 Free Software Foundation, Inc.
+ Copyright (C) 2002-2004, 2006, 2009-2013 Free Software Foundation, Inc.
- This program is free software; you can redistribute it and/or modify
+ 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
- the Free Software Foundation; either version 2, or (at your option)
- any later version.
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -13,8 +13,7 @@
GNU General Public License for more details.
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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+ along with this program. If not, see . */
/* Contributed by Paul Eggert . */
@@ -32,6 +31,19 @@
#include "quotearg.h"
#include "xmemcoll.h"
+static void
+collate_error (int collation_errno,
+ char const *s1, size_t s1len,
+ char const *s2, size_t s2len)
+{
+ error (0, collation_errno, _("string comparison failed"));
+ error (0, 0, _("Set LC_ALL='C' to work around the problem."));
+ error (exit_failure, 0,
+ _("The strings compared were %s and %s."),
+ quotearg_n_style_mem (0, locale_quoting_style, s1, s1len),
+ quotearg_n_style_mem (1, locale_quoting_style, s2, s2len));
+}
+
/* 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
@@ -43,16 +55,22 @@ xmemcoll (char *s1, size_t s1len, char *s2, size_t s2len)
{
int diff = memcoll (s1, s1len, s2, s2len);
int collation_errno = errno;
-
if (collation_errno)
- {
- error (0, collation_errno, _("string comparison failed"));
- error (0, 0, _("Set LC_ALL='C' to work around the problem."));
- error (exit_failure, 0,
- _("The strings compared were %s and %s."),
- quotearg_n_style_mem (0, locale_quoting_style, s1, s1len),
- quotearg_n_style_mem (1, locale_quoting_style, s2, s2len));
- }
+ collate_error (collation_errno, s1, s1len, s2, s2len);
+ return diff;
+}
+/* Compare S1 (a memory block of size S1SIZE, with a NUL as last byte)
+ and S2 (a memory block of size S2SIZE, with a NUL as last byte)
+ according to the LC_COLLATE locale. S1SIZE and S2SIZE must be > 0.
+ Report an error and exit if there is an error. */
+
+int
+xmemcoll0 (char const *s1, size_t s1size, char const *s2, size_t s2size)
+{
+ int diff = memcoll0 (s1, s1size, s2, s2size);
+ int collation_errno = errno;
+ if (collation_errno)
+ collate_error (collation_errno, s1, s1size - 1, s2, s2size - 1);
return diff;
}