From 99fbf4cfdbb3b67f30d595a7f1c535ca17c2f969 Mon Sep 17 00:00:00 2001 From: Rich Felker Date: Tue, 17 Apr 2012 21:17:09 -0400 Subject: make wide scanf %[ respect width --- src/stdio/vfwscanf.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/stdio/vfwscanf.c b/src/stdio/vfwscanf.c index 92b7fa40..beb8e8fb 100644 --- a/src/stdio/vfwscanf.c +++ b/src/stdio/vfwscanf.c @@ -243,7 +243,7 @@ int vfwscanf(FILE *f, const wchar_t *fmt, va_list ap) int gotmatch = 0; - for (;;) { + while (width) { if ((c=getwc(f))<0) break; if (in_set(p, c) == invert) break; @@ -255,9 +255,10 @@ int vfwscanf(FILE *f, const wchar_t *fmt, va_list ap) if (s) s+=l; } pos++; + width--; gotmatch=1; } - ungetwc(c, f); + if (width) ungetwc(c, f); if (!gotmatch) goto match_fail; -- cgit v1.2.1