further fixes to leading space issue (forgot the wide versions)

diff --git a/src/stdlib/wcstod.c b/src/stdlib/wcstod.c
index 338c616052f81dd4ba183c2fefe629004b682404..5ec45dd7abc345365350fec96c30eae6d96f04b8 100644 (file)
--- a/src/stdlib/wcstod.c
+++ b/src/stdlib/wcstod.c
@@ -39,9 +39,11 @@ static long double wcstox(const wchar_t *s, wchar_t **p, int prec)
        while (iswspace(*t)) t++;
        f.cookie = (void *)t;
        shlim(&f, 0);
-       long double y = __floatscan(&f, -1, prec, 1);
-       off_t cnt = shcnt(&f);
-       if (p) *p = cnt ? t + cnt : (wchar_t *)s;
+       long double y = __floatscan(&f, prec, 1);
+       if (p) {
+               size_t cnt = shcnt(&f);
+               *p = cnt ? t + cnt : (wchar_t *)s;
+       }
        return y;
 }
 

diff --git a/src/stdlib/wcstol.c b/src/stdlib/wcstol.c
index 822bcf1a243795521a26a9a378746af0889ab0f7..840bb0a6d8209163595b2e7db1cea813de3b31ba 100644 (file)
--- 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,12 +36,13 @@ 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;
 }