From 434bf7e8d009867dd85773908859d6429c210102 Mon Sep 17 00:00:00 2001 From: Manuel Novoa III Date: Sun, 5 Jan 2003 04:47:26 +0000 Subject: Fix a silly bug in _wstdio_fwrite. wprintf %s should now work correctly. --- TODO | 2 +- libc/stdio/stdio.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/TODO b/TODO index 88be58f9e..5a9fa220b 100644 --- a/TODO +++ b/TODO @@ -22,7 +22,7 @@ I'm currently working on completing the wide char and locale support. 1) Little things that need fixing: ---------------------------------- - *) Fix bugs in *printf: wprintf %ls bug ; outdigit precison bug + *) Fix bug in *printf: outdigit precison bug a) Use locale decimal point in *printf() and strto*d() -- slightly complicated by the fact that at least one locale uses a wchar radix that does not map to a single byte in UTF-8. diff --git a/libc/stdio/stdio.c b/libc/stdio/stdio.c index e39cf5205..7db727c76 100644 --- a/libc/stdio/stdio.c +++ b/libc/stdio/stdio.c @@ -48,6 +48,8 @@ * * Nov 21, 2002 * Added internal function _wstdio_fwrite. + * Jan 3, 2003 + * Fixed a bug in _wstdio_fwrite. */ /* Before we include anything, convert L_ctermid to L_ctermid_function @@ -3514,7 +3516,7 @@ size_t _wstdio_fwrite(const wchar_t *__restrict ws, size_t n, pw = ws; count = 0; while (n > count) { - r = wcsnrtombs(buf, &pw, n, sizeof(buf), &stream->state); + r = wcsnrtombs(buf, &pw, n-count, sizeof(buf), &stream->state); if (r != ((size_t) -1)) { /* No encoding errors */ if (!r) { ++r; /* 0 is returned when nul is reached. */ -- cgit v1.2.3