From: Rich Felker <dalias@aerifal.cx>
Date: Wed, 18 Apr 2012 03:35:49 +0000 (-0400)
Subject: fix wide scanf's handling of input failure on %c, and simplify %[
X-Git-Url: http://nsz.repo.hu/git/?p=musl;a=commitdiff_plain;h=bdeb184c3d08ea5017e1570e0f0431e9d7fd02fd;hp=a12aa2918535fd370419bd24b50a33974091c5a7

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

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