[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: new module 'mbrtowc'
|
From: |
Bruno Haible |
|
Subject: |
Re: new module 'mbrtowc' |
|
Date: |
Sun, 21 Dec 2008 02:55:28 +0100 |
|
User-agent: |
KMail/1.9.9 |
The unit test for mbrtowc uncovered four different bugs in various systems of
the system-provided mbrtowc function.
mbrtowc was introduced to allow traversing strings that are stored in
non-contiguous memory blocks. This essential functionality does not
work on AIX 5.1, HP-UX 11.11, OSF/1 5.1, Solaris 10.
I slowly get the feeling that all these operating systems are being
developed without any kind of testsuite.
The workarounds against all these bugs took me hours.
2008-12-20 Bruno Haible <address@hidden>
Work around mbrtowc bugs on AIX, HP-UX, OSF/1, Solaris.
* lib/wchar.in.h (mbstate_t): Redefine also if REPLACE_MBSTATE_T is
set.
(GNULIB_defined_mbstate_t): New macro.
(mbsinit): Redefine if REPLACE_MBSINIT is set.
(mbrtowc): Redefine if REPLACE_MBRTOWC is set.
* lib/mbrtowc.c (rpl_mbrtowc): Add an alternative implementation that
reuses the system's mbrtowc function but works around the bugs.
* m4/mbrtowc.m4 (gl_MBSTATE_T_BROKEN, gl_MBRTOWC_INCOMPLETE_STATE,
gl_MBRTOWC_NULL_ARG, gl_MBRTOWC_RETVAL, gl_MBRTOWC_NUL_RETVAL): New
macros.
(gl_FUNC_MBRTOWC): Invoke them. Set REPLACE_MBRTOWC if mbrtowc needs to
be overridden. Optionally define MBRTOWC_NULL_ARG_BUG,
MBRTOWC_RETVAL_BUG, MBRTOWC_NUL_RETVAL_BUG.
* m4/mbsinit.m4 (gl_FUNC_MBSINIT): Invoke gl_MBSTATE_T_BROKEN. Set
REPLACE_MBSINIT if mbsinit needs to be overridden.
* m4/wchar.m4 (gl_WCHAR_H_DEFAULTS): Initialize REPLACE_MBSTATE_T,
REPLACE_MBSINIT, REPLACE_MBRTOWC.
* modules/wchar (Makefile.am): Substitute REPLACE_MBSTATE_T,
REPLACE_MBSINIT, REPLACE_MBRTOWC.
* modules/mbrtowc (Files): Add m4/locale-fr.m4, m4/locale-ja.m4,
m4/locale-zh.m4.
(Depends): Add mbsinit.
* modules/mbsinit (Depends): Add mbrtowc.
* doc/posix-functions/mbrtowc.texi: Mention the various bugs.
*** doc/posix-functions/mbrtowc.texi.orig 2008-12-21 02:37:12.000000000
+0100
--- doc/posix-functions/mbrtowc.texi 2008-12-21 01:52:24.000000000 +0100
***************
*** 11,16 ****
--- 11,32 ----
@item
This function is missing on some platforms:
HP-UX 11, IRIX 6.5, Solaris 2.6, mingw, Interix 3.5.
+ @item
+ This function does not put the state into non-initial state when parsing an
+ incomplete multibyte character on some platforms:
+ AIX 5.1, OSF/1 5.1.
+ @item
+ This function does not ignore the @code{pwc} argument if the string argument
is
+ NULL on some platforms:
+ OSF/1 5.1.
+ @item
+ This function returns the total number of bytes that make up the multibyte
+ character, not the number of bytes that were needed to complete the multibyte
+ character, on some platforms:
+ HP-UX 11.11, Solaris 10.
+ @item
+ This function may not return 0 when parsing the NUL character on some
platforms:
+ Solaris 9.
@end itemize
Portability problems not fixed by Gnulib:
*** lib/wchar.in.h.orig 2008-12-21 02:37:12.000000000 +0100
--- lib/wchar.in.h 2008-12-21 01:24:12.000000000 +0100
***************
*** 74,83 ****
/* Override mbstate_t if it is too small.
On IRIX 6.5, sizeof (mbstate_t) == 1, which is not sufficient for
implementing mbrtowc for encodings like UTF-8. */
! #if !(@HAVE_MBSINIT@ && @HAVE_MBRTOWC@)
typedef int rpl_mbstate_t;
# undef mbstate_t
# define mbstate_t rpl_mbstate_t
#endif
--- 74,84 ----
/* Override mbstate_t if it is too small.
On IRIX 6.5, sizeof (mbstate_t) == 1, which is not sufficient for
implementing mbrtowc for encodings like UTF-8. */
! #if !(@HAVE_MBSINIT@ && @HAVE_MBRTOWC@) || @REPLACE_MBSTATE_T@
typedef int rpl_mbstate_t;
# undef mbstate_t
# define mbstate_t rpl_mbstate_t
+ # define GNULIB_defined_mbstate_t 1
#endif
***************
*** 116,122 ****
/* Test whether *PS is in the initial state. */
#if @GNULIB_MBSINIT@
! # if address@hidden@
extern int mbsinit (const mbstate_t *ps);
# endif
#elif defined GNULIB_POSIXCHECK
--- 117,127 ----
/* Test whether *PS is in the initial state. */
#if @GNULIB_MBSINIT@
! # if @REPLACE_MBSINIT@
! # undef mbsinit
! # define mbsinit rpl_mbsinit
! # endif
! # if address@hidden@ || @REPLACE_MBSINIT@
extern int mbsinit (const mbstate_t *ps);
# endif
#elif defined GNULIB_POSIXCHECK
***************
*** 130,136 ****
/* Convert a multibyte character to a wide character. */
#if @GNULIB_MBRTOWC@
! # if address@hidden@
extern size_t mbrtowc (wchar_t *pwc, const char *s, size_t n, mbstate_t *ps);
# endif
#elif defined GNULIB_POSIXCHECK
--- 135,145 ----
/* Convert a multibyte character to a wide character. */
#if @GNULIB_MBRTOWC@
! # if @REPLACE_MBRTOWC@
! # undef mbrtowc
! # define mbrtowc rpl_mbrtowc
! # endif
! # if address@hidden@ || @REPLACE_MBRTOWC@
extern size_t mbrtowc (wchar_t *pwc, const char *s, size_t n, mbstate_t *ps);
# endif
#elif defined GNULIB_POSIXCHECK
*** lib/mbrtowc.c.orig 2008-12-21 02:37:12.000000000 +0100
--- lib/mbrtowc.c 2008-12-21 01:50:51.000000000 +0100
***************
*** 20,31 ****
/* Specification. */
#include <wchar.h>
! #include <errno.h>
! #include <stdlib.h>
! #include "localcharset.h"
! #include "streq.h"
! #include "verify.h"
verify (sizeof (mbstate_t) >= 4);
--- 20,34 ----
/* Specification. */
#include <wchar.h>
! #if GNULIB_defined_mbstate_t
! /* Implement mbrtowc() on top of mbtowc(). */
! # include <errno.h>
! # include <stdlib.h>
!
! # include "localcharset.h"
! # include "streq.h"
! # include "verify.h"
verify (sizeof (mbstate_t) >= 4);
***************
*** 88,97 ****
/* Here 0 < m ≤ 4. */
! #if __GLIBC__
/* Work around bug <http://sourceware.org/bugzilla/show_bug.cgi?id=9674>
*/
mbtowc (NULL, NULL, 0);
! #endif
{
int res = mbtowc (pwc, p, m);
--- 91,100 ----
/* Here 0 < m ≤ 4. */
! # if __GLIBC__
/* Work around bug <http://sourceware.org/bugzilla/show_bug.cgi?id=9674>
*/
mbtowc (NULL, NULL, 0);
! # endif
{
int res = mbtowc (pwc, p, m);
***************
*** 272,274 ****
--- 275,349 ----
}
}
}
+
+ #else
+ /* Override the system's mbrtowc() function. */
+
+ # undef mbrtowc
+
+ size_t
+ rpl_mbrtowc (wchar_t *pwc, const char *s, size_t n, mbstate_t *ps)
+ {
+ # if MBRTOWC_NULL_ARG_BUG || MBRTOWC_RETVAL_BUG
+ if (s == NULL)
+ {
+ pwc = NULL;
+ s = "";
+ n = 1;
+ }
+ # endif
+
+ # if MBRTOWC_RETVAL_BUG
+ {
+ static mbstate_t internal_state;
+
+ /* Override mbrtowc's internal state. We can not call mbsinit() on the
+ hidden internal state, but we can call it on our variable. */
+ if (ps == NULL)
+ ps = &internal_state;
+
+ if (!mbsinit (ps))
+ {
+ /* Parse the rest of the multibyte character byte for byte. */
+ size_t count = 0;
+ for (; n > 0; s++, n--)
+ {
+ wchar_t wc;
+ size_t ret = mbrtowc (&wc, s, 1, ps);
+
+ if (ret == (size_t)(-1))
+ return (size_t)(-1);
+ count++;
+ if (ret != (size_t)(-2))
+ {
+ /* The multibyte character has been completed. */
+ if (pwc != NULL)
+ *pwc = wc;
+ return (wc == 0 ? 0 : count);
+ }
+ }
+ return (size_t)(-2);
+ }
+ }
+ # endif
+
+ # if MBRTOWC_NUL_RETVAL_BUG
+ {
+ wchar_t wc;
+ size_t ret = mbrtowc (&wc, s, n, ps);
+
+ if (ret != (size_t)(-1) && ret != (size_t)(-2))
+ {
+ if (pwc != NULL)
+ *pwc = wc;
+ if (wc == 0)
+ ret = 0;
+ }
+ return ret;
+ }
+ # else
+ return mbrtowc (pwc, s, n, ps);
+ # endif
+ }
+
+ #endif
*** m4/mbrtowc.m4.orig 2008-12-21 02:37:12.000000000 +0100
--- m4/mbrtowc.m4 2008-12-21 01:45:25.000000000 +0100
***************
*** 1,4 ****
! # mbrtowc.m4 serial 10
dnl Copyright (C) 2001-2002, 2004-2005, 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,
--- 1,4 ----
! # mbrtowc.m4 serial 11
dnl Copyright (C) 2001-2002, 2004-2005, 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,23 ****
--- 9,296 ----
AC_REQUIRE([gl_WCHAR_H_DEFAULTS])
AC_REQUIRE([AC_TYPE_MBSTATE_T])
+ gl_MBSTATE_T_BROKEN
+ if test $REPLACE_MBSTATE_T = 1; then
+ REPLACE_MBRTOWC=1
+ fi
AC_CHECK_FUNCS_ONCE([mbrtowc])
if test $ac_cv_func_mbrtowc = no; then
HAVE_MBRTOWC=0
+ fi
+ if test $HAVE_MBRTOWC != 0 && test $REPLACE_MBRTOWC != 1; then
+ gl_MBRTOWC_NULL_ARG
+ gl_MBRTOWC_RETVAL
+ gl_MBRTOWC_NUL_RETVAL
+ case "$gl_cv_func_mbrtowc_null_arg" in
+ *yes) ;;
+ *) AC_DEFINE([MBRTOWC_NULL_ARG_BUG], [1],
+ [Define if the mbrtowc function has the NULL string argument bug.])
+ REPLACE_MBRTOWC=1
+ ;;
+ esac
+ case "$gl_cv_func_mbrtowc_retval" in
+ *yes) ;;
+ *) AC_DEFINE([MBRTOWC_RETVAL_BUG], [1],
+ [Define if the mbrtowc function returns a wrong return value.])
+ REPLACE_MBRTOWC=1
+ ;;
+ esac
+ case "$gl_cv_func_mbrtowc_nul_retval" in
+ *yes) ;;
+ *) AC_DEFINE([MBRTOWC_NUL_RETVAL_BUG], [1],
+ [Define if the mbrtowc function does not return 0 for a NUL
character.])
+ REPLACE_MBRTOWC=1
+ ;;
+ esac
+ fi
+ if test $HAVE_MBRTOWC = 0 || test $REPLACE_MBRTOWC = 1; then
gl_REPLACE_WCHAR_H
AC_LIBOBJ([mbrtowc])
gl_PREREQ_MBRTOWC
fi
])
+ dnl Test whether mbsinit() and mbrtowc() need to be overridden in a way that
+ dnl redefines the semantics of the given mbstate_t type.
+ dnl Result is REPLACE_MBSTATE_T.
+ dnl When this is set to 1, we replace both mbsinit() and mbrtowc(), in order
to
+ dnl avoid inconsistencies.
+
+ AC_DEFUN([gl_MBSTATE_T_BROKEN],
+ [
+ AC_REQUIRE([gl_WCHAR_H_DEFAULTS])
+
+ AC_REQUIRE([AC_TYPE_MBSTATE_T])
+ AC_CHECK_FUNCS_ONCE([mbsinit])
+ AC_CHECK_FUNCS_ONCE([mbrtowc])
+ if test $ac_cv_func_mbsinit = yes && test $ac_cv_func_mbrtowc = yes; then
+ gl_MBRTOWC_INCOMPLETE_STATE
+ case "$gl_cv_func_mbrtowc_incomplete_state" in
+ *yes) REPLACE_MBSTATE_T=0 ;;
+ *) REPLACE_MBSTATE_T=1 ;;
+ esac
+ else
+ REPLACE_MBSTATE_T=1
+ fi
+ if test $REPLACE_MBSTATE_T = 1; then
+ gl_REPLACE_WCHAR_H
+ fi
+ ])
+
+ dnl Test whether mbrtowc puts the state into non-initial state when parsing an
+ dnl incomplete multibyte character.
+ dnl Result is gl_cv_func_mbrtowc_incomplete_state.
+
+ AC_DEFUN([gl_MBRTOWC_INCOMPLETE_STATE],
+ [
+ AC_REQUIRE([AC_PROG_CC])
+ AC_REQUIRE([gt_LOCALE_JA])
+ AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
+ AC_CACHE_CHECK([whether mbrtowc handles incomplete characters],
+ [gl_cv_func_mbrtowc_incomplete_state],
+ [
+ dnl Initial guess, used when cross-compiling or when no suitable locale
+ dnl is present.
+ changequote(,)dnl
+ case "$host_os" in
+ # Guess no on AIX and OSF/1.
+ osf*) gl_cv_func_mbrtowc_incomplete_state="guessing no" ;;
+ # Guess yes otherwise.
+ *) gl_cv_func_mbrtowc_incomplete_state="guessing yes" ;;
+ esac
+ changequote([,])dnl
+ if test $LOCALE_JA != none; then
+ AC_TRY_RUN([
+ #include <locale.h>
+ #include <string.h>
+ #include <wchar.h>
+ int main ()
+ {
+ if (setlocale (LC_ALL, "$LOCALE_JA") != NULL)
+ {
+ const char input[] = "B\217\253\344\217\251\316er"; /* "Büßer" */
+ mbstate_t state;
+ wchar_t wc;
+ int ret;
+
+ memset (&state, '\0', sizeof (mbstate_t));
+ if (mbrtowc (&wc, input + 1, 1, &state) == (size_t)(-2))
+ if (mbsinit (&state))
+ return 1;
+ }
+ return 0;
+ }],
+ [gl_cv_func_mbrtowc_incomplete_state=yes],
+ [gl_cv_func_mbrtowc_incomplete_state=no],
+ [])
+ fi
+ ])
+ ])
+
+ dnl Test whether mbrtowc supports a NULL string argument correctly.
+ dnl Result is gl_cv_func_mbrtowc_null_arg.
+
+ AC_DEFUN([gl_MBRTOWC_NULL_ARG],
+ [
+ AC_REQUIRE([AC_PROG_CC])
+ AC_REQUIRE([gt_LOCALE_FR_UTF8])
+ AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
+ AC_CACHE_CHECK([whether mbrtowc handles a NULL string argument],
+ [gl_cv_func_mbrtowc_null_arg],
+ [
+ dnl Initial guess, used when cross-compiling or when no suitable locale
+ dnl is present.
+ changequote(,)dnl
+ case "$host_os" in
+ # Guess no on OSF/1.
+ osf*) gl_cv_func_mbrtowc_null_arg="guessing no" ;;
+ # Guess yes otherwise.
+ *) gl_cv_func_mbrtowc_null_arg="guessing yes" ;;
+ esac
+ changequote([,])dnl
+ if test $LOCALE_FR_UTF8 != none; then
+ AC_TRY_RUN([
+ #include <locale.h>
+ #include <string.h>
+ #include <wchar.h>
+ int main ()
+ {
+ if (setlocale (LC_ALL, "$LOCALE_FR_UTF8") != NULL)
+ {
+ mbstate_t state;
+ wchar_t wc;
+ int ret;
+
+ memset (&state, '\0', sizeof (mbstate_t));
+ wc = (wchar_t) 0xBADFACE;
+ mbrtowc (&wc, NULL, 5, &state);
+ /* Check that wc was not modified. */
+ if (wc != (wchar_t) 0xBADFACE)
+ return 1;
+ }
+ return 0;
+ }], [gl_cv_func_mbrtowc_null_arg=yes], [gl_cv_func_mbrtowc_null_arg=no], [])
+ fi
+ ])
+ ])
+
+ dnl Test whether mbrtowc, when parsing the end of a multibyte character,
+ dnl correctly returns the number of bytes that were needed to complete the
+ dnl character (not the total number of bytes of the multibyte character).
+ dnl Result is gl_cv_func_mbrtowc_retval.
+
+ AC_DEFUN([gl_MBRTOWC_RETVAL],
+ [
+ AC_REQUIRE([AC_PROG_CC])
+ AC_REQUIRE([gt_LOCALE_FR_UTF8])
+ AC_REQUIRE([gt_LOCALE_JA])
+ AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
+ AC_CACHE_CHECK([whether mbrtowc has a correct return value],
+ [gl_cv_func_mbrtowc_retval],
+ [
+ dnl Initial guess, used when cross-compiling or when no suitable locale
+ dnl is present.
+ changequote(,)dnl
+ case "$host_os" in
+ # Guess no on HP-UX and Solaris.
+ hpux* | solaris*) gl_cv_func_mbrtowc_retval="guessing no" ;;
+ # Guess yes otherwise.
+ *) gl_cv_func_mbrtowc_retval="guessing yes" ;;
+ esac
+ changequote([,])dnl
+ if test $LOCALE_FR_UTF8 != none || test $LOCALE_JA != none; then
+ AC_TRY_RUN([
+ #include <locale.h>
+ #include <string.h>
+ #include <wchar.h>
+ int main ()
+ {
+ /* This fails on Solaris. */
+ if (setlocale (LC_ALL, "$LOCALE_FR_UTF8") != NULL)
+ {
+ char input[] = "B\303\274\303\237er"; /* "Büßer" */
+ mbstate_t state;
+ wchar_t wc;
+
+ memset (&state, '\0', sizeof (mbstate_t));
+ if (mbrtowc (&wc, input + 1, 1, &state) == (size_t)(-2))
+ {
+ input[1] = '\0';
+ if (mbrtowc (&wc, input + 2, 5, &state) != 1)
+ return 1;
+ }
+ }
+ /* This fails on HP-UX 11.11. */
+ if (setlocale (LC_ALL, "$LOCALE_JA") != NULL)
+ {
+ char input[] = "B\217\253\344\217\251\316er"; /* "Büßer" */
+ mbstate_t state;
+ wchar_t wc;
+
+ memset (&state, '\0', sizeof (mbstate_t));
+ if (mbrtowc (&wc, input + 1, 1, &state) == (size_t)(-2))
+ {
+ input[1] = '\0';
+ if (mbrtowc (&wc, input + 2, 5, &state) != 2)
+ return 1;
+ }
+ }
+ return 0;
+ }],
+ [gl_cv_func_mbrtowc_retval=yes],
+ [gl_cv_func_mbrtowc_retval=no],
+ [])
+ fi
+ ])
+ ])
+
+ dnl Test whether mbrtowc, when parsing a NUL character, correctly returns 0.
+ dnl Result is gl_cv_func_mbrtowc_nul_retval.
+
+ AC_DEFUN([gl_MBRTOWC_NUL_RETVAL],
+ [
+ AC_REQUIRE([AC_PROG_CC])
+ AC_REQUIRE([gt_LOCALE_ZH_CN])
+ AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
+ AC_CACHE_CHECK([whether mbrtowc returns 0 when parsing a NUL character],
+ [gl_cv_func_mbrtowc_nul_retval],
+ [
+ dnl Initial guess, used when cross-compiling or when no suitable locale
+ dnl is present.
+ changequote(,)dnl
+ case "$host_os" in
+ # Guess no on Solaris 9.
+ solaris2.9) gl_cv_func_mbrtowc_nul_retval="guessing no" ;;
+ # Guess yes otherwise.
+ *) gl_cv_func_mbrtowc_nul_retval="guessing yes" ;;
+ esac
+ changequote([,])dnl
+ if test $LOCALE_ZH_CN != none; then
+ AC_TRY_RUN([
+ #include <locale.h>
+ #include <string.h>
+ #include <wchar.h>
+ int main ()
+ {
+ /* This fails on Solaris 9. */
+ if (setlocale (LC_ALL, "$LOCALE_ZH_CN") != NULL)
+ {
+ mbstate_t state;
+ wchar_t wc;
+
+ memset (&state, '\0', sizeof (mbstate_t));
+ if (mbrtowc (&wc, "", 1, &state) != 0)
+ return 1;
+ }
+ return 0;
+ }],
+ [gl_cv_func_mbrtowc_nul_retval=yes],
+ [gl_cv_func_mbrtowc_nul_retval=no],
+ [])
+ fi
+ ])
+ ])
+
# Prerequisites of lib/mbrtowc.c.
AC_DEFUN([gl_PREREQ_MBRTOWC], [
:
*** m4/mbsinit.m4.orig 2008-12-21 02:37:12.000000000 +0100
--- m4/mbsinit.m4 2008-12-21 01:24:12.000000000 +0100
***************
*** 1,4 ****
! # mbsinit.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,
--- 1,4 ----
! # mbsinit.m4 serial 3
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,17 ****
--- 9,23 ----
AC_REQUIRE([gl_WCHAR_H_DEFAULTS])
AC_REQUIRE([AC_TYPE_MBSTATE_T])
+ gl_MBSTATE_T_BROKEN
+ if test $REPLACE_MBSTATE_T = 1; then
+ REPLACE_MBSINIT=1
+ fi
AC_CHECK_FUNCS_ONCE([mbsinit])
if test $ac_cv_func_mbsinit = no; then
HAVE_MBSINIT=0
+ fi
+ if test $HAVE_MBSINIT = 0 || test $REPLACE_MBSINIT = 1; then
gl_REPLACE_WCHAR_H
AC_LIBOBJ([mbsinit])
gl_PREREQ_MBSINIT
*** m4/wchar.m4.orig 2008-12-21 02:37:12.000000000 +0100
--- m4/wchar.m4 2008-12-21 01:25:05.000000000 +0100
***************
*** 7,13 ****
dnl Written by Eric Blake.
! # wchar.m4 serial 13
AC_DEFUN([gl_WCHAR_H],
[
--- 7,13 ----
dnl Written by Eric Blake.
! # wchar.m4 serial 14
AC_DEFUN([gl_WCHAR_H],
[
***************
*** 76,82 ****
--- 76,85 ----
HAVE_MBSRTOWCS=1; AC_SUBST([HAVE_MBSRTOWCS])
HAVE_DECL_WCTOB=1; AC_SUBST([HAVE_DECL_WCTOB])
HAVE_DECL_WCWIDTH=1; AC_SUBST([HAVE_DECL_WCWIDTH])
+ REPLACE_MBSTATE_T=0; AC_SUBST([REPLACE_MBSTATE_T])
REPLACE_WCTOB=0; AC_SUBST([REPLACE_WCTOB])
+ REPLACE_MBSINIT=0; AC_SUBST([REPLACE_MBSINIT])
+ REPLACE_MBRTOWC=0; AC_SUBST([REPLACE_MBRTOWC])
REPLACE_WCWIDTH=0; AC_SUBST([REPLACE_WCWIDTH])
WCHAR_H=''; AC_SUBST([WCHAR_H])
])
*** modules/mbrtowc.orig 2008-12-21 02:37:12.000000000 +0100
--- modules/mbrtowc 2008-12-21 01:51:29.000000000 +0100
***************
*** 5,13 ****
--- 5,17 ----
lib/mbrtowc.c
m4/mbrtowc.m4
m4/mbstate_t.m4
+ m4/locale-fr.m4
+ m4/locale-ja.m4
+ m4/locale-zh.m4
Depends-on:
wchar
+ mbsinit
localcharset
streq
verify
*** modules/mbsinit.orig 2008-12-21 02:37:12.000000000 +0100
--- modules/mbsinit 2008-12-21 01:24:12.000000000 +0100
***************
*** 8,13 ****
--- 8,14 ----
Depends-on:
wchar
+ mbrtowc
verify
extensions
*** modules/wchar.orig 2008-12-21 02:37:12.000000000 +0100
--- modules/wchar 2008-12-21 01:25:14.000000000 +0100
***************
*** 40,46 ****
--- 40,49 ----
-e 's|@''HAVE_MBSRTOWCS''@|$(HAVE_MBSRTOWCS)|g' \
-e 's|@''HAVE_DECL_WCTOB''@|$(HAVE_DECL_WCTOB)|g' \
-e 's|@''HAVE_DECL_WCWIDTH''@|$(HAVE_DECL_WCWIDTH)|g' \
+ -e 's|@''REPLACE_MBSTATE_T''@|$(REPLACE_MBSTATE_T)|g' \
-e 's|@''REPLACE_WCTOB''@|$(REPLACE_WCTOB)|g' \
+ -e 's|@''REPLACE_MBSINIT''@|$(REPLACE_MBSINIT)|g' \
+ -e 's|@''REPLACE_MBRTOWC''@|$(REPLACE_MBRTOWC)|g' \
-e 's|@''REPLACE_WCWIDTH''@|$(REPLACE_WCWIDTH)|g' \
-e '/definition of GL_LINK_WARNING/r $(LINK_WARNING_H)' \
< $(srcdir)/wchar.in.h; \