From 3c720987c599927e9a8764b9362e4751c00ec1b1 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Tue, 7 Apr 1998 20:39:52 +0000 Subject: Update. 1998-04-07 20:32 Ulrich Drepper * wcsmbs/btowc.c: Fix dozends of bugs in untested code. * wcsmbs/mbrtowc.c: Likewise. * wcsmbs/mbsnrtowcs.c: Likewise. * wcsmbs/mbsrtowcs.c: Likewise. * wcsmbs/wcrtomb.c: Likewise. * wcsmbs/wcsnrtombs.c: Likewise. * wcsmbs/wcsrtombs.c: Likewise. * wcsmbs/wctob.c: Likewise. * iconv/gconv-simple.c (__gconv_transform_ascii_ucs4): Compute position of next output character correctly. (__gconv_transform_ucs4_ascii): Count used input bytes correctly. * stdio-common/vfprintf.c (vfprintf): Clear state before used. * stdlib/strtod.c: Don't use mbtowc. 1998-04-07 19:07 H.J. Lu * libio/fileops.c (_IO_file_xsgetn): Call __underflow () when what we want is smaller than a buffer. 1998-04-07 18:14 Ulrich Drepper * elf/dl-support.c (_dl_important_hwcaps): Define dummy version of this function. --- wcsmbs/wctob.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'wcsmbs/wctob.c') diff --git a/wcsmbs/wctob.c b/wcsmbs/wctob.c index 0461877d32..e70b4e7fe6 100644 --- a/wcsmbs/wctob.c +++ b/wcsmbs/wctob.c @@ -56,9 +56,10 @@ wctob (c) (const char *) inbuf, &inbytes, &converted, 0); /* The conversion failed or the output is too long. */ - if (status != GCONV_OK && status != GCONV_FULL_OUTPUT + if ((status != GCONV_OK && status != GCONV_FULL_OUTPUT + && status != GCONV_EMPTY_INPUT) || data.outbufavail != 1) - return WEOF; + return EOF; return buf[0]; } -- cgit 1.4.1