testsuite-discovered fixes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2010-01-25 02:00:16 +01:00
parent 2315c8854c
commit 307b24c851
3 changed files with 8 additions and 6 deletions

View file

@ -203,11 +203,13 @@ size_t FAST_FUNC mbstowcs(wchar_t *dest, const char *src, size_t n)
while (n) {
wchar_t wc;
const char *rc = mbstowc_internal(dest ? dest : &wc, src);
if (rc == NULL) /* error */
src = mbstowc_internal(&wc, src);
if (src == NULL) /* error */
return (size_t) -1L;
if (dest)
dest++;
*dest++ = wc;
if (wc == 0) /* end-of-string */
break;
n--;
}