*** empty log message ***

diff --git a/lib/ChangeLog b/lib/ChangeLog
index 606a3ada66f9479a1f25b70c6bf6cae70fac67ad..4d3ea3c718e761ec6cb5551a02dec3236959379e 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,21 @@
+2001-01-21  Paul Eggert  <eggert@twinsun.com>
+
+       * xmemcoll.h, xmemcoll.c: New files.
+       * Makefile.am (libfetish_a_SOURCES): Add them.
+       * memcoll.c: Include errno.h, and declare errno if not defined.
+       (memcoll): Set errno to zero if there is no error.
+
+       * quotearg.c (quotearg_buffer_restyled):
+       Fix bug with quoting buffers containing NUL when backslashing escapes.
+       This bug was exposed by the other changes in this patch.
+       (quotearg_n_options): New arg ARGSIZE.
+       All callers changed.
+       (quoting_options_from_style): New function.
+       (quotearg_n_style): Use it.
+       (quotearg_n_style_mem): New function.
+
+       * quotearg.h (quotearg_n_style_mem): New function.
+
 2002-01-16  Jim Meyering  <meyering@lucent.com>
 
        * getdate.y: Add three semicolons, each just before a closing brace.

diff --git a/lib/xmemcoll.c b/lib/xmemcoll.c
new file mode 100644 (file)
index 0000000..0e35cb6
--- /dev/null
+++ b/lib/xmemcoll.c
@@ -0,0 +1,70 @@
+/* Locale-specific memory comparison.
+   Copyright (C) 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
+   the Free Software Foundation; either version 2, 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
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+
+/* Contributed by Paul Eggert <eggert@twinsun.com>.  */
+
+#if HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#include <errno.h>
+#ifndef errno
+extern int errno;
+#endif
+
+#include <stdlib.h>
+
+#if ENABLE_NLS
+# include <libintl.h>
+# define _(Text) gettext (Text)
+#else
+# define _(Text) Text
+#endif
+
+#include "error.h"
+#include "memcoll.h"
+#include "quotearg.h"
+#include "xmemcoll.h"
+
+/* Exit value when xmemcoll fails.
+   The caller may set it to some other value.  */
+int xmemcoll_exit_failure = EXIT_FAILURE;
+
+/* 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.  Report an error
+   and exit if there is an error.  */
+
+int
+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 (xmemcoll_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));
+    }
+
+  return diff;
+}

diff --git a/lib/xmemcoll.h b/lib/xmemcoll.h
new file mode 100644 (file)
index 0000000..dfda0fc
--- /dev/null
+++ b/lib/xmemcoll.h
@@ -0,0 +1,2 @@
+extern int xmemcoll_exit_failure;
+int xmemcoll (char *, size_t, char *, size_t);