all printf variants: fix argument type handling for %c and %lc

[musl] / src / stdio / vfwscanf.c

diff --git a/src/stdio/vfwscanf.c b/src/stdio/vfwscanf.c
index b1eb793..82f4860 100644 (file)
--- a/src/stdio/vfwscanf.c
+++ b/src/stdio/vfwscanf.c
@@ -6,15 +6,11 @@
 #include <wctype.h>
 #include <limits.h>
 #include <string.h>
-#include <errno.h>
-#include <math.h>
-#include <float.h>
 
 #include "stdio_impl.h"
 #include "shgetc.h"
 #include "intscan.h"
 #include "floatscan.h"
-#include "libc.h"
 
 #define SIZE_hh -2
 #define SIZE_h  -1
@@ -80,7 +76,7 @@ static int in_set(const wchar_t *set, int c)
 #if 1
 #undef getwc
 #define getwc(f) \
-       ((f)->rpos < (f)->rend && *(f)->rpos < 128 ? *(f)->rpos++ : (getwc)(f))
+       ((f)->rpos != (f)->rend && *(f)->rpos < 128 ? *(f)->rpos++ : (getwc)(f))
 
 #undef ungetwc
 #define ungetwc(c,f) \
@@ -107,8 +103,12 @@ int vfwscanf(FILE *restrict f, const wchar_t *restrict fmt, va_list ap)
 
        FLOCK(f);
 
+       fwide(f, 1);
+
        for (p=fmt; *p; p++) {
 
+               alloc = 0;
+
                if (iswspace(*p)) {
                        while (iswspace(p[1])) p++;
                        while (iswspace((c=getwc(f)))) pos++;
@@ -116,8 +116,12 @@ int vfwscanf(FILE *restrict f, const wchar_t *restrict fmt, va_list ap)
                        continue;
                }
                if (*p != '%' || p[1] == '%') {
-                       p += *p=='%';
-                       c = getwc(f);
+                       if (*p == '%') {
+                               p++;
+                               while (iswspace((c=getwc(f)))) pos++;
+                       } else {
+                               c = getwc(f);
+                       }
                        if (c!=*p) {
                                ungetwc(c, f);
                                if (c<0) goto input_fail;
@@ -141,6 +145,8 @@ int vfwscanf(FILE *restrict f, const wchar_t *restrict fmt, va_list ap)
                }
 
                if (*p=='m') {
+                       wcs = 0;
+                       s = 0;
                        alloc = !!dest;
                        p++;
                } else {
@@ -211,11 +217,12 @@ int vfwscanf(FILE *restrict f, const wchar_t *restrict fmt, va_list ap)
                                set = L"";
                        } else if (t == 's') {
                                invert = 1;
-                               set = (const wchar_t[]){
+                               static const wchar_t spaces[] = {
                                        ' ', '\t', '\n', '\r', 11, 12,  0x0085,
                                        0x2000, 0x2001, 0x2002, 0x2003, 0x2004, 0x2005,
                                        0x2006, 0x2008, 0x2009, 0x200a,
                                        0x2028, 0x2029, 0x205f, 0x3000, 0 };
+                               set = spaces;
                        } else {
                                if (*++p == '^') p++, invert = 1;
                                else invert = 0;
@@ -281,8 +288,10 @@ int vfwscanf(FILE *restrict f, const wchar_t *restrict fmt, va_list ap)
                                if (size == SIZE_l) *(wchar_t **)dest = wcs;
                                else *(char **)dest = s;
                        }
-                       if (wcs) wcs[i] = 0;
-                       if (s) s[i] = 0;
+                       if (t != 'c') {
+                               if (wcs) wcs[i] = 0;
+                               if (s) s[i] = 0;
+                       }
                        break;
 
                case 'd': case 'i': case 'o': case 'u': case 'x':