mirrors/musl
1
0
Fork 0
mirror of https://git.musl-libc.org/git/musl synced 2025-03-15 07:02:52 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix treatment by fgetws of encoding errors as eof

Browse Source 
fgetwc does not set the stream's error indicator on encoding errors,
making ferror insufficient to distinguish between error and eof
conditions. feof is also insufficient, since it will return true if
the file ended with a partial character encoding error.

whether fgetwc should be setting the error indicator itself is a
question with conflicting answers. the POSIX text for the function
states it as a requirement, but the ISO C text seems to require that
it not. this may be revisited in the future based on the outcome of
Austin Group issue #1170.
This commit is contained in:
Rich Felker 2017-11-20 14:23:49 -05:00
parent 72656157f5
commit a90d9da1d1
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/stdio/fgetws.c
View File

@ -1,5 +1,6 @@
#include "stdio_impl.h"
#include <wchar.h>
#include <errno.h>
wint_t __fgetwc_unlocked(FILE *);
@ -11,6 +12,10 @@ wchar_t *fgetws(wchar_t *restrict s, int n, FILE *restrict f)
FLOCK(f);
/* Setup a dummy errno so we can detect EILSEQ. This is
* the only way to catch encoding errors in the form of a
* partial character just before EOF. */
errno = EAGAIN;
for (; n; n--) {
wint_t c = __fgetwc_unlocked(f);
if (c == WEOF) break;
@ -18,7 +23,7 @@ wchar_t *fgetws(wchar_t *restrict s, int n, FILE *restrict f)
if (c == '\n') break;
}
*p = 0;
if (ferror(f)) p = s;
if (ferror(f) || errno==EILSEQ) p = s;
FUNLOCK(f);