Avoid mempcpy in the regex code, as the string.h mempcpy stuff

is causing more trouble than it's curing.
* lib/regex_internal.h (__mempcpy): Remove.
* lib/regcomp.c (regerror): Rewrite to avoid the need for mempcpy
(and make the code a tad smaller to boot).
* m4/regex.m4 (gl_PREREQ_REGEX): Don't check for mempcpy.

diff --git a/ChangeLog b/ChangeLog
index 23710561ceff583d4d3b72e2e08a8eff0658cf7e..ec527f6eb01ea1b9af5040433bcc63e05844e0e7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2007-02-02  Paul Eggert  <eggert@cs.ucla.edu>
+
+       Avoid mempcpy in the regex code, as the string.h mempcpy stuff
+       is causing more trouble than it's curing.
+       * lib/regex_internal.h (__mempcpy): Remove.
+       * lib/regcomp.c (regerror): Rewrite to avoid the need for mempcpy
+       (and make the code a tad smaller to boot).
+       * m4/regex.m4 (gl_PREREQ_REGEX): Don't check for mempcpy.
+
 2007-02-02  Jim Meyering  <jim@meyering.net>
 
        * modules/arpa_inet: Put AC_PROG_MKDIR_P in the configure.ac:

diff --git a/lib/regcomp.c b/lib/regcomp.c
index 6f1b7691333da850c480a13e8607bf8e438425bc..6546be47e846365d94cb9641e1d78923588012f1 100644 (file)
--- a/lib/regcomp.c
+++ b/lib/regcomp.c
@@ -542,17 +542,13 @@ regerror (int errcode, const regex_t *_Restrict_ preg,
 
   if (BE (errbuf_size != 0, 1))
     {
+      size_t cpy_size = msg_size;
       if (BE (msg_size > errbuf_size, 0))
        {
-#if defined HAVE_MEMPCPY || defined _LIBC
-         *((char *) __mempcpy (errbuf, msg, errbuf_size - 1)) = '\0';
-#else
-         memcpy (errbuf, msg, errbuf_size - 1);
-         errbuf[errbuf_size - 1] = 0;
-#endif
+         cpy_size = errbuf_size - 1;
+         errbuf[cpy_size] = '\0';
        }
-      else
-       memcpy (errbuf, msg, msg_size);
+      memcpy (errbuf, msg, cpy_size);
     }
 
   return msg_size;

diff --git a/lib/regex_internal.h b/lib/regex_internal.h
index 50d6b05e6802e54c63e039e664e3bf6704fba37d..a19c9a7fa6b34a86ea52bdd29e51cd869bce5bde 100644 (file)
--- a/lib/regex_internal.h
+++ b/lib/regex_internal.h
@@ -112,10 +112,6 @@
 # define __wctype wctype
 # define __iswctype iswctype
 # define __btowc btowc
-# ifndef __mempcpy
-#  undef mempcpy
-#  define __mempcpy mempcpy
-# endif
 # define __wcrtomb wcrtomb
 # define __regfree regfree
 # define attribute_hidden

diff --git a/m4/regex.m4 b/m4/regex.m4
index 25da645e1241d5ed3e7fcda6d1ba7bd76b164068..e5c6e974a5b360695fb56ce35b9d04c638284da4 100644 (file)
--- a/m4/regex.m4
+++ b/m4/regex.m4
@@ -1,4 +1,4 @@
-#serial 42
+#serial 43
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
 # 2006, 2007 Free Software Foundation, Inc.
@@ -193,6 +193,6 @@ AC_DEFUN([gl_PREREQ_REGEX],
   AC_REQUIRE([AC_GNU_SOURCE])
   AC_REQUIRE([AC_C_RESTRICT])
   AC_REQUIRE([AM_LANGINFO_CODESET])
-  AC_CHECK_FUNCS_ONCE([iswctype mbrtowc mempcpy wcrtomb wcscoll])
+  AC_CHECK_FUNCS_ONCE([iswctype mbrtowc wcrtomb wcscoll])
   AC_CHECK_DECLS([isblank], [], [], [#include <ctype.h>])
 ])