fix microblaze asm relocations for shared libc

[musl] / src / stdlib / wcstol.c

diff --git a/src/stdlib/wcstol.c b/src/stdlib/wcstol.c
index cbdd806..3d7c97d 100644 (file)
--- a/src/stdlib/wcstol.c
+++ b/src/stdlib/wcstol.c
@@ -11,6 +11,7 @@ static size_t do_read(FILE *f, unsigned char *buf, size_t len)
        size_t i;
        const wchar_t *wcs = f->cookie;
 
+       if (!wcs[0]) wcs=L"@";
        for (i=0; i<f->buf_size && wcs[i]; i++)
                f->buf[i] = wcs[i] < 128 ? wcs[i] : '@';
        f->rpos = f->buf;
@@ -26,50 +27,52 @@ 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;
        f.rpos = f.rend = 0;
-       f.buf = buf;
-       f.buf_size = sizeof buf;
+       f.buf = buf + 4;
+       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);
 }