upstream-mirrors/gnulib
1
0
Fork 0
mirror of https://https.git.savannah.gnu.org/git/gnulib.git synced 2026-09-01 02:34:55 +00:00
Code Activity

wcsrtombs: Work around bug on native Windows.

Browse Source 
* 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.
This commit is contained in:
Bruno Haible
2011-02-12 20:43:40 +01:00
parent aa887f85e1
commit c9dc6fff80
4 changed files with 23 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChangeLog
+8
View File
@@ -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.
doc/posix-functions/wcsrtombs.texi
+3
View File
@@ -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
lib/wcsrtombs.c
+1 -1
View File
@@ -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
m4/wcsrtombs.m4
+11 -8
View File
@@ -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],