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

[musl] / src / stdio / vsscanf.c

diff --git a/src/stdio/vsscanf.c b/src/stdio/vsscanf.c
index 9850022..4d6d259 100644 (file)
--- a/src/stdio/vsscanf.c
+++ b/src/stdio/vsscanf.c
@@ -1,15 +1,25 @@
 #include "stdio_impl.h"
+#include <string.h>
 
-static size_t do_read(FILE *f, unsigned char *buf, size_t len)
+static size_t string_read(FILE *f, unsigned char *buf, size_t len)
 {
-       return __string_read(f, buf, len);
+       char *src = f->cookie;
+       size_t k = len+256;
+       char *end = memchr(src, 0, k);
+       if (end) k = end-src;
+       if (k < len) len = k;
+       memcpy(buf, src, len);
+       f->rpos = (void *)(src+len);
+       f->rend = (void *)(src+k);
+       f->cookie = src+k;
+       return len;
 }
 
 int vsscanf(const char *restrict s, const char *restrict fmt, va_list ap)
 {
        FILE f = {
                .buf = (void *)s, .cookie = (void *)s,
-               .read = do_read, .lock = -1
+               .read = string_read, .lock = -1
        };
        return vfscanf(&f, fmt, ap);
 }