X-Git-Url: http://nsz.repo.hu/git/?p=musl;a=blobdiff_plain;f=src%2Fstdlib%2Fwcstol.c;h=3d7c97da6b257ceee089e80241db7061f5b38c87;hp=822bcf1a243795521a26a9a378746af0889ab0f7;hb=90f770523f54b2e63a6ad46cba0149c9dc01ddd4;hpb=a4310aa2f592779118912fe5e7f6df4fd6b6d64a

diff --git a/src/stdlib/wcstol.c b/src/stdlib/wcstol.c
index 822bcf1a..3d7c97da 100644
--- a/src/stdlib/wcstol.c
+++ b/src/stdlib/wcstol.c
@@ -27,6 +27,7 @@ static size_t do_read(FILE *f, unsigned char *buf, size_t len)
 
 static unsigned long long wcstox(const wchar_t *s, wchar_t **p, int base, unsigned long long lim)
 {
+	wchar_t *t = (wchar_t *)s;
 	unsigned char buf[64];
 	FILE f = {0};
 	f.flags = 0;
@@ -35,42 +36,43 @@ static unsigned long long wcstox(const wchar_t *s, wchar_t **p, int base, unsign
 	f.buf_size = sizeof buf - 4;
 	f.lock = -1;
 	f.read = do_read;
-	f.cookie = (void *)s;
+	while (iswspace(*t)) t++;
+	f.cookie = (void *)t;
 	shlim(&f, 0);
 	unsigned long long y = __intscan(&f, base, 1, lim);
 	if (p) {
 		size_t cnt = shcnt(&f);
-		*p = (wchar_t *)s + cnt;
+		*p = cnt ? t + cnt : (wchar_t *)s;
 	}
 	return y;
 }
 
-unsigned long long wcstoull(const wchar_t *s, wchar_t **p, int base)
+unsigned long long wcstoull(const wchar_t *restrict s, wchar_t **restrict p, int base)
 {
 	return wcstox(s, p, base, ULLONG_MAX);
 }
 
-long long wcstoll(const wchar_t *s, wchar_t **p, int base)
+long long wcstoll(const wchar_t *restrict s, wchar_t **restrict p, int base)
 {
 	return wcstox(s, p, base, LLONG_MIN);
 }
 
-unsigned long wcstoul(const wchar_t *s, wchar_t **p, int base)
+unsigned long wcstoul(const wchar_t *restrict s, wchar_t **restrict p, int base)
 {
 	return wcstox(s, p, base, ULONG_MAX);
 }
 
-long wcstol(const wchar_t *s, wchar_t **p, int base)
+long wcstol(const wchar_t *restrict s, wchar_t **restrict p, int base)
 {
 	return wcstox(s, p, base, 0UL+LONG_MIN);
 }
 
-intmax_t wcstoimax(const wchar_t *s, wchar_t **p, int base)
+intmax_t wcstoimax(const wchar_t *restrict s, wchar_t **restrict p, int base)
 {
 	return wcstoll(s, p, base);
 }
 
-uintmax_t wcstoumax(const wchar_t *s, wchar_t **p, int base)
+uintmax_t wcstoumax(const wchar_t *restrict s, wchar_t **restrict p, int base)
 {
 	return wcstoull(s, p, base);
 }