Re: new module 'mbsrtowcs'

[Bruno Haible]

When gnulib redefines mbstate_t, it also needs to override the system's
mbsrtowcs implementation. Needed in particular on AIX.


2008-12-20  Bruno Haible  <address@hidden>

        * lib/wchar.in.h (mbsrtowcs): Redefine if REPLACE_MBSRTOWCS is set.
        * m4/mbsrtowcs.m4 (gl_FUNC_MBSRTOWCS): Invoke gl_MBSTATE_T_BROKEN. Set
        REPLACE_MBSRTOWCS if mbsrtowcs needs to be overridden.
        * m4/wchar.m4 (gl_WCHAR_H_DEFAULTS): Initialize REPLACE_MBSRTOWCS.
        * modules/wchar (Makefile.am): Substitute REPLACE_MBSRTOWCS.

--- lib/wchar.in.h.orig 2008-12-21 04:28:47.000000000 +0100
+++ lib/wchar.in.h      2008-12-21 04:28:31.000000000 +0100
@@ -167,7 +167,11 @@
 
 /* Convert a string to a wide string.  */
 #if @GNULIB_MBSRTOWCS@
-# if address@hidden@
+# if @REPLACE_MBSRTOWCS@
+#  undef mbsrtowcs
+#  define mbsrtowcs rpl_mbsrtowcs
+# endif
+# if address@hidden@ || @REPLACE_MBSRTOWCS@
 extern size_t mbsrtowcs (wchar_t *dest, const char **srcp, size_t len, 
mbstate_t *ps);
 # endif
 #elif defined GNULIB_POSIXCHECK
--- m4/mbsrtowcs.m4.orig        2008-12-21 04:28:47.000000000 +0100
+++ m4/mbsrtowcs.m4     2008-12-21 04:28:31.000000000 +0100
@@ -1,4 +1,4 @@
-# mbsrtowcs.m4 serial 1
+# mbsrtowcs.m4 serial 2
 dnl Copyright (C) 2008 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -9,9 +9,15 @@
   AC_REQUIRE([gl_WCHAR_H_DEFAULTS])
 
   AC_REQUIRE([AC_TYPE_MBSTATE_T])
+  gl_MBSTATE_T_BROKEN
+  if test $REPLACE_MBSTATE_T = 1; then
+    REPLACE_MBSRTOWCS=1
+  fi
   AC_CHECK_FUNCS_ONCE([mbsrtowcs])
   if test $ac_cv_func_mbsrtowcs = no; then
     HAVE_MBSRTOWCS=0
+  fi
+  if test $HAVE_MBSRTOWCS = 0 || test $REPLACE_MBSRTOWCS = 1; then
     gl_REPLACE_WCHAR_H
     AC_LIBOBJ([mbsrtowcs])
     gl_PREREQ_MBSRTOWCS
--- m4/wchar.m4.orig    2008-12-21 04:28:47.000000000 +0100
+++ m4/wchar.m4 2008-12-21 04:28:31.000000000 +0100
@@ -7,7 +7,7 @@
 
 dnl Written by Eric Blake.
 
-# wchar.m4 serial 14
+# wchar.m4 serial 15
 
 AC_DEFUN([gl_WCHAR_H],
 [
@@ -80,6 +80,7 @@
   REPLACE_WCTOB=0;     AC_SUBST([REPLACE_WCTOB])
   REPLACE_MBSINIT=0;   AC_SUBST([REPLACE_MBSINIT])
   REPLACE_MBRTOWC=0;   AC_SUBST([REPLACE_MBRTOWC])
+  REPLACE_MBSRTOWCS=0; AC_SUBST([REPLACE_MBSRTOWCS])
   REPLACE_WCWIDTH=0;   AC_SUBST([REPLACE_WCWIDTH])
   WCHAR_H='';          AC_SUBST([WCHAR_H])
 ])
--- modules/wchar.orig  2008-12-21 04:28:47.000000000 +0100
+++ modules/wchar       2008-12-21 04:28:31.000000000 +0100
@@ -44,6 +44,7 @@
              -e 's|@''REPLACE_WCTOB''@|$(REPLACE_WCTOB)|g' \
              -e 's|@''REPLACE_MBSINIT''@|$(REPLACE_MBSINIT)|g' \
              -e 's|@''REPLACE_MBRTOWC''@|$(REPLACE_MBRTOWC)|g' \
+             -e 's|@''REPLACE_MBSRTOWCS''@|$(REPLACE_MBSRTOWCS)|g' \
              -e 's|@''REPLACE_WCWIDTH''@|$(REPLACE_WCWIDTH)|g' \
              -e '/definition of GL_LINK_WARNING/r $(LINK_WARNING_H)' \
            < $(srcdir)/wchar.in.h; \