JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

2004-05-03 Artem B. Bityuckiy <abitytsky@softminecorp.com>

Browse Source 
* libc/stdio/vfprintf.c (_VFPRINTF_R): Set error flag when
        multibyte functions return failure for %C, %S, %lc, and %ls
        format specifiers.
This commit is contained in:
Jeff Johnston 2004-05-03 20:17:59 +00:00
parent 1c63798e1d
commit 1af84bb7f5
2 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
newlib/ChangeLog
View File

@ -1,3 +1,9 @@
2004-05-03 Artem B. Bityuckiy <abitytsky@softminecorp.com>
* libc/stdio/vfprintf.c (_VFPRINTF_R): Set error flag when
multibyte functions return failure for %C, %S, %lc, and %ls
format specifiers.
2004-05-03 Artem B. Bityuckiy <abitytsky@softminecorp.com> 2004-05-03 Artem B. Bityuckiy <abitytsky@softminecorp.com>
* testsuite/include/check.h (CHECK): Add flush of stdout. * testsuite/include/check.h (CHECK): Add flush of stdout.

20
newlib/libc/stdio/vfprintf.c
View File

@ -762,8 +762,10 @@ reswitch: switch (ch) {
memset ((_PTR)&ps, '\0', sizeof (mbstate_t)); memset ((_PTR)&ps, '\0', sizeof (mbstate_t));
if ((size = (int)_wcrtomb_r (data, cp, if ((size = (int)_wcrtomb_r (data, cp,
(wchar_t)GET_ARG (N, ap, wint_t), (wchar_t)GET_ARG (N, ap, wint_t),
&ps)) == -1) &ps)) == -1) {
fp->_flags |= __SERR;
goto error; goto error;
}
} }
else { else {
*cp = GET_ARG (N, ap, int); *cp = GET_ARG (N, ap, int);
@ -942,8 +944,10 @@ reswitch: switch (ch) {
if (wcp[m] == L'\0') if (wcp[m] == L'\0')
break; break;
if ((n = (int)_wcrtomb_r (data, if ((n = (int)_wcrtomb_r (data,
buf, wcp[m], &ps)) == -1) buf, wcp[m], &ps)) == -1) {
fp->_flags |= __SERR;
goto error; goto error;
}
if (n + size > prec) if (n + size > prec)
break; break;
m += 1; m += 1;
@ -954,8 +958,10 @@ reswitch: switch (ch) {
} }
else { else {
if ((size = (int)_wcsrtombs_r (data, if ((size = (int)_wcsrtombs_r (data,
NULL, &wcp, 0, &ps)) == -1) NULL, &wcp, 0, &ps)) == -1) {
fp->_flags |= __SERR;
goto error; goto error;
}
wcp = (_CONST wchar_t *)cp; wcp = (_CONST wchar_t *)cp;
} }
@ -963,14 +969,18 @@ reswitch: switch (ch) {
break; break;
if ((malloc_buf = if ((malloc_buf =
(char *)_malloc_r (data, size + 1)) == NULL) (char *)_malloc_r (data, size + 1)) == NULL) {
fp->_flags |= __SERR;
goto error; goto error;
}
/* Convert widechar string to multibyte string. */ /* Convert widechar string to multibyte string. */
memset ((_PTR)&ps, '\0', sizeof (mbstate_t)); memset ((_PTR)&ps, '\0', sizeof (mbstate_t));
if (_wcsrtombs_r (data, malloc_buf, if (_wcsrtombs_r (data, malloc_buf,
&wcp, size, &ps) != size) &wcp, size, &ps) != size) {
fp->_flags |= __SERR;
goto error; goto error;
}
cp = malloc_buf; cp = malloc_buf;
cp[size] = '\0'; cp[size] = '\0';
} }