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

fix wide scanf to respect field width for strings

This commit is contained in:
Rich Felker 2012-04-17 19:37:31 -04:00
parent e0d9f780d1
commit 0072251572
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/stdio/vfwscanf.c
View File

@ -83,7 +83,7 @@ static int in_set(const wchar_t *set, int c)
#undef ungetwc
#define ungetwc(c,f) \
((f)->rend && (c)<128 ? *--(f)->rpos : ungetwc((c),(f)))
((f)->rend && (c)<128U ? *--(f)->rpos : ungetwc((c),(f)))
#endif
int vfwscanf(FILE *f, const wchar_t *fmt, va_list ap)
@ -215,19 +215,22 @@ int vfwscanf(FILE *f, const wchar_t *fmt, va_list ap)
case 's':
s = dest;
while (!iswspace(c=getwc(f)) && c!=EOF) {
while (width && !iswspace(c=getwc(f)) && c!=EOF) {
int l = wctomb(s?s:tmp, c);
if (l<0) goto input_fail;
if (s) s+=l;
pos++;
width--;
}
if (width) ungetwc(c, f);
if (s) *s = 0;
break;
case 'S':
wcs = dest;
while (!iswspace(c=getwc(f)) && c!=EOF)
pos++, *wcs++ = c;
while (width && !iswspace(c=getwc(f)) && c!=EOF)
width--, pos++, *wcs++ = c;
if (width) ungetwc(c, f);
if (wcs) *wcs = 0;
break;