On mingw, I'm also seeing this test failure:
test-wcsrtombs.c:69: assertion failed
FAIL: test-wcsrtombs1.sh
This fixes it, by using the gnulib replacement (and without causing a
regression on HP-UX 11).
2011-02-12 Bruno Haible <br...@clisp.org>
wcsrtombs: Work around bug on native Windows.
* m4/wcsrtombs.m4 (gl_WCSRTOMBS_NULL): Test against mingw bug.
* lib/wcsrtombs.c (rpl_wcsrtombs): When dest is NULL, pass SIZE_MAX
instead of len.
* doc/posix-functions/wcsrtombs.texi: Document mingw bug.
--- doc/posix-functions/wcsrtombs.texi.orig Sat Feb 12 20:50:37 2011
+++ doc/posix-functions/wcsrtombs.texi Sat Feb 12 20:29:24 2011
@@ -15,6 +15,9 @@
This function may set the source pointer to NULL before NUL terminating the
destination string on some platforms:
OSF/1 5.1.
@item
+This function does not ignore the length argument if the destination argument
is NULL on some platforms:
+mingw.
+@item
This function updates the source pointer also if the destination argument is
NULL on some platforms:
HP-UX 11, OSF/1 5.1.
@end itemize
--- lib/wcsrtombs.c.orig Sat Feb 12 20:50:37 2011
+++ lib/wcsrtombs.c Sat Feb 12 20:49:43 2011
@@ -37,7 +37,7 @@
{
const wchar_t *temp_src = *srcp;
- return wcsrtombs (NULL, &temp_src, len, ps);
+ return wcsrtombs (NULL, &temp_src, (size_t)-1, ps);
}
else
# endif
--- m4/wcsrtombs.m4.orig Sat Feb 12 20:50:37 2011
+++ m4/wcsrtombs.m4 Sat Feb 12 20:32:20 2011
@@ -1,4 +1,4 @@
-# wcsrtombs.m4 serial 7
+# wcsrtombs.m4 serial 8
dnl Copyright (C) 2008-2011 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -123,10 +123,10 @@
dnl is present.
changequote(,)dnl
case "$host_os" in
- # Guess no on HP-UX and OSF/1.
- hpux* | osf*) gl_cv_func_wcsrtombs_null="guessing no" ;;
- # Guess yes otherwise.
- *) gl_cv_func_wcsrtombs_null="guessing yes" ;;
+ # Guess no on HP-UX, OSF/1, mingw.
+ hpux* | osf* | mingw*) gl_cv_func_wcsrtombs_null="guessing no" ;;
+ # Guess yes otherwise.
+ *) gl_cv_func_wcsrtombs_null="guessing yes" ;;
esac
changequote([,])dnl
if test $LOCALE_FR != none; then
@@ -144,6 +144,7 @@
#include <wchar.h>
int main ()
{
+ int result = 0;
if (setlocale (LC_ALL, "$LOCALE_FR") != NULL)
{
const char original[] = "B\374\337er";
@@ -152,12 +153,14 @@
if (mbstowcs (input, original, 10) == 5)
{
const wchar_t *src = input;
- wcsrtombs (NULL, &src, 10, NULL);
+ size_t ret = wcsrtombs (NULL, &src, 3, NULL);
+ if (ret != 5)
+ result |= 1;
if (src != input)
- return 1;
+ result |= 2;
}
}
- return 0;
+ return result;
}]])],
[gl_cv_func_wcsrtombs_null=yes],
[gl_cv_func_wcsrtombs_null=no],
--
In memoriam France Bloch-Sérazin
<http://en.wikipedia.org/wiki/France_Bloch-Sérazin>
