X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Fstdio%2Fvsscanf.c;h=4d6d259b8291a6af68e101d871ac7d4b2f8373e9;hb=59b64ff686cef2a87e9552658b2c8d2531f87176;hp=929ffa3b0fd8a33754b0638536d0893bed74d9a1;hpb=14f0272ea1775c35801b2bc17e67ef8bb7e9742d;p=musl

diff --git a/src/stdio/vsscanf.c b/src/stdio/vsscanf.c
index 929ffa3b..4d6d259b 100644
--- a/src/stdio/vsscanf.c
+++ b/src/stdio/vsscanf.c
@@ -1,16 +1,25 @@
 #include "stdio_impl.h"
-#include "libc.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);
 }