X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Fstdio%2Fvsscanf.c;h=4d6d259b8291a6af68e101d871ac7d4b2f8373e9;hb=dec8f0a4fa7aa533c843e6eaec862be674ff3a1a;hp=fd48f709702a678d189b580ed09f91d19f5d5543;hpb=0b44a0315b47dd8eced9f3b7f31580cf14bbfc01;p=musl

diff --git a/src/stdio/vsscanf.c b/src/stdio/vsscanf.c
index fd48f709..4d6d259b 100644
--- a/src/stdio/vsscanf.c
+++ b/src/stdio/vsscanf.c
@@ -1,21 +1,27 @@
-#include <stdio.h>
+#include "stdio_impl.h"
 #include <string.h>
-#include <ctype.h>
 
-#include "__scanf.h"
-
-static void s_read(rctx_t *r)
+static size_t string_read(FILE *f, unsigned char *buf, size_t len)
 {
-	unsigned char *s = r->opaque;
-	if (!s[r->l]) r->c = -1;
-	else r->c = s[r->l++];
+	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 *s, const char *fmt, va_list ap)
+int vsscanf(const char *restrict s, const char *restrict fmt, va_list ap)
 {
-	size_t l = strlen(fmt), i;
-	wchar_t fmt2[l+1];
-	rctx_t r = { s_read, (void *)s, 0, isspace };
-	for (i=0; i<=l; i++) fmt2[i] = (unsigned char)fmt[i];
-	return __scanf(&r, fmt2, ap);
+	FILE f = {
+		.buf = (void *)s, .cookie = (void *)s,
+		.read = string_read, .lock = -1
+	};
+	return vfscanf(&f, fmt, ap);
 }
+
+weak_alias(vsscanf,__isoc99_vsscanf);