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.

diff --git a/ChangeLog b/ChangeLog
index e2d86dfa7f4653a6291236cd08359a6d5b890997..c6ab4ccac84261a458fb2dec7ce05cd6ab2145b2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2011-02-12  Bruno Haible  <bruno@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.
+
 2011-02-12  Bruno Haible  <bruno@clisp.org>
 
        mbsrtowcs: Work around bug on native Windows.

diff --git a/doc/posix-functions/wcsrtombs.texi b/doc/posix-functions/wcsrtombs.texi
index 3f8e0817a8453f797f37129732517b565a697512..230c61b59d715e477f806f83219caed47f3dce08 100644 (file)
--- a/doc/posix-functions/wcsrtombs.texi
+++ b/doc/posix-functions/wcsrtombs.texi
@@ -15,6 +15,9 @@ HP-UX 11.00, IRIX 6.5, Solaris 2.6, mingw, Interix 3.5.
 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

diff --git a/lib/wcsrtombs.c b/lib/wcsrtombs.c
index 72423b524b0e0210ce2348c6adba4685a35491f6..ebbca78f6553266843902675cc9668cb57b27049 100644 (file)
--- a/lib/wcsrtombs.c
+++ b/lib/wcsrtombs.c
@@ -37,7 +37,7 @@ rpl_wcsrtombs (char *dest, const wchar_t **srcp, size_t len, mbstate_t *ps)
     {
       const wchar_t *temp_src = *srcp;
 
-      return wcsrtombs (NULL, &temp_src, len, ps);
+      return wcsrtombs (NULL, &temp_src, (size_t)-1, ps);
     }
   else
 # endif

diff --git a/m4/wcsrtombs.m4 b/m4/wcsrtombs.m4
index ec767de8f6243542ed7fbe64be62a5dc344f7beb..19f0c78a9e4565ee934e9a03b0af6e8482f275dd 100644 (file)
--- a/m4/wcsrtombs.m4
+++ b/m4/wcsrtombs.m4
@@ -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 @@ AC_DEFUN([gl_WCSRTOMBS_NULL],
       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 @@ changequote([,])dnl
 #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 @@ int main ()
       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],