RepoMirrors
/
musl
mirror of git://git.musl-libc.org/musl
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix wide scanf's handling of input failure on %c, and simplify %[

This commit is contained in:
Rich Felker 2012-04-17 23:35:49 -04:00
parent a12aa29185
commit bdeb184c3d
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/stdio/vfwscanf.c
View File

@ -181,8 +181,11 @@ int vfwscanf(FILE *f, const wchar_t *fmt, va_list ap)
/* Transform ls,lc -> S,C */ /* Transform ls,lc -> S,C */
if (size==SIZE_l && (t&15)==3) t&=~32; if (size==SIZE_l && (t&15)==3) t&=~32;
if (t != 'n' && t != '[' && (t|32) != 'c') { if (t != 'n') {
while (iswspace((c=getwc(f)))) pos++; if (t != '[' && (t|32) != 'c')
while (iswspace((c=getwc(f)))) pos++;
else
c=getwc(f);
if (c < 0) goto input_fail; if (c < 0) goto input_fail;
ungetwc(c, f); ungetwc(c, f);
} }
@ -264,9 +267,7 @@ int vfwscanf(FILE *f, const wchar_t *fmt, va_list ap)
} }
if (width) ungetwc(c, f); if (width) ungetwc(c, f);
if (!gotmatch) if (!gotmatch) goto match_fail;
if (c>=0) goto match_fail;
else goto input_fail;
if (*p==']') p++; if (*p==']') p++;
while (*p!=']') { while (*p!=']') {