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

[musl] / src / stdio / vfwscanf.c

diff --git a/src/stdio/vfwscanf.c b/src/stdio/vfwscanf.c
index beb8e8f..de74fe0 100644 (file)
--- 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);
                }
@@ -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,6 +248,8 @@ int vfwscanf(FILE *f, const wchar_t *fmt, va_list ap)
 
                        int gotmatch = 0;
 
+                       if (width < 1) width = -1;
+
                        while (width) {
                                if ((c=getwc(f))<0) break;
                                if (in_set(p, c) == invert)
@@ -255,7 +262,7 @@ int vfwscanf(FILE *f, const wchar_t *fmt, va_list ap)
                                        if (s) s+=l;
                                }
                                pos++;
-                               width--;
+                               width-=(width>0);
                                gotmatch=1;
                        }
                        if (width) ungetwc(c, f);