X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Fstdio%2Fvfwscanf.c;h=b3bc6f3a285ee0a2339aae41d200a15ad4b27b01;hb=5afc74fbaa2371f30df0dc9fb7bc3afe6bd96137;hp=92b7fa40ac6873890e5ea1f5148fcdd3d0427fd6;hpb=00722515729bb6943dc84a8c4aa9ccd715e48e74;p=musl

diff --git a/src/stdio/vfwscanf.c b/src/stdio/vfwscanf.c
index 92b7fa40..b3bc6f3a 100644
--- a/src/stdio/vfwscanf.c
+++ b/src/stdio/vfwscanf.c
@@ -86,7 +86,7 @@ static int in_set(const wchar_t *set, int c)
 	((f)->rend && (c)<128U ? *--(f)->rpos : ungetwc((c),(f)))
 #endif
 
-int vfwscanf(FILE *f, const wchar_t *fmt, va_list ap)
+int vfwscanf(FILE *restrict f, const wchar_t *restrict fmt, va_list ap)
 {
 	int width;
 	int size;
@@ -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);
 		}
@@ -214,13 +217,14 @@ int vfwscanf(FILE *f, const wchar_t *fmt, va_list ap)
 			break;
 
 		case 's':
+			if (width < 1) width = -1;
 			s = dest;
 			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--;
+				width-=(width>0);
 			}
 			if (width) ungetwc(c, f);
 			if (s) *s = 0;
@@ -228,8 +232,9 @@ int vfwscanf(FILE *f, const wchar_t *fmt, va_list ap)
 
 		case 'S':
 			wcs = dest;
+			if (width < 1) width = -1;
 			while (width && !iswspace(c=getwc(f)) && c!=EOF)
-				width--, pos++, *wcs++ = c;
+				width-=(width>0), pos++, *wcs++ = c;
 			if (width) ungetwc(c, f);
 			if (wcs) *wcs = 0;
 			break;
@@ -243,7 +248,9 @@ int vfwscanf(FILE *f, const wchar_t *fmt, va_list ap)
 
 			int gotmatch = 0;
 
-			for (;;) {
+			if (width < 1) width = -1;
+
+			while (width) {
 				if ((c=getwc(f))<0) break;
 				if (in_set(p, c) == invert)
 					break;
@@ -255,9 +262,10 @@ int vfwscanf(FILE *f, const wchar_t *fmt, va_list ap)
 					if (s) s+=l;
 				}
 				pos++;
+				width-=(width>0);
 				gotmatch=1;
 			}
-			ungetwc(c, f);
+			if (width) ungetwc(c, f);
 
 			if (!gotmatch) goto match_fail;