瀏覽代碼

make wide scanf %[ respect width

Rich Felker 13 年之前
父節點
當前提交
99fbf4cfdb
共有 1 個文件被更改,包括 3 次插入2 次删除
  1. 3 2
      src/stdio/vfwscanf.c

+ 3 - 2
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;