fix really bad breakage in strtol, etc.: failure to accept leading spaces

diff --git a/src/internal/floatscan.c b/src/internal/floatscan.c
index 321754314da493b8ea80a411a993fa38e5008b4b..7381e9a4108aa9d0714a90d95586e99d122ae4cc 100644 (file)
--- a/src/internal/floatscan.c
+++ b/src/internal/floatscan.c
@@ -394,12 +394,13 @@ static long double hexfloat(FILE *f, int bits, int emin, int sign, int pok)
        return scalbnl(y, e2);
 }
 
-long double __floatscan(FILE *f, int c, int prec, int pok)
+long double __floatscan(FILE *f, int prec, int pok)
 {
        int sign = 1;
        int i;
        int bits;
        int emin;
+       int c;
 
        switch (prec) {
        case 0:
@@ -418,7 +419,7 @@ long double __floatscan(FILE *f, int c, int prec, int pok)
                return 0;
        }
 
-       if (c<0) c = shgetc(f);
+       while (isspace((c=shgetc(f))));
 
        if (c=='+' || c=='-') {
                sign -= 2*(c=='-');

diff --git a/src/internal/floatscan.h b/src/internal/floatscan.h
index 5595b81e6eddac3b509c74092f8a3e064077d54e..e027fa08f107bf0893f3132df06200e0d2beb1c2 100644 (file)
--- a/src/internal/floatscan.h
+++ b/src/internal/floatscan.h
@@ -3,6 +3,6 @@
 
 #include <stdio.h>
 
-long double __floatscan(FILE *, int, int, int);
+long double __floatscan(FILE *, int, int);
 
 #endif

diff --git a/src/internal/intscan.c b/src/internal/intscan.c
index d65fc45c3c5359a7ffc88066b13cfeaf805a02fb..178cdf0dcec056d11d47803040e7af9d74fa03b5 100644 (file)
--- a/src/internal/intscan.c
+++ b/src/internal/intscan.c
@@ -32,7 +32,7 @@ unsigned long long __intscan(FILE *f, unsigned base, int pok, unsigned long long
                errno = EINVAL;
                return 0;
        }
-       c = shgetc(f);
+       while (isspace((c=shgetc(f))));
        if (c=='+' || c=='-') {
                neg = -(c=='-');
                c = shgetc(f);

diff --git a/src/stdio/vfscanf.c b/src/stdio/vfscanf.c
index 73294cdb990770cb3ea65a0036c17f41f1b996ae..64fa97543142e16012f34c632ffbca209cf05cf6 100644 (file)
--- a/src/stdio/vfscanf.c
+++ b/src/stdio/vfscanf.c
@@ -291,7 +291,7 @@ int vfscanf(FILE *f, const char *fmt, va_list ap)
                case 'e': case 'E':
                case 'f': case 'F':
                case 'g': case 'G':
-                       y = __floatscan(f, -1, size, 0);
+                       y = __floatscan(f, size, 0);
                        if (!shcnt(f)) goto match_fail;
                        if (dest) switch (size) {
                        case SIZE_def:

diff --git a/src/stdlib/strtod.c b/src/stdlib/strtod.c
index ecfabdf14107c241794fd4d0398d6bbf98bc2e59..1886efa5e2c17089e68ef67b5695f615c25708b6 100644 (file)
--- a/src/stdlib/strtod.c
+++ b/src/stdlib/strtod.c
@@ -5,16 +5,14 @@
 
 static long double strtox(const char *s, char **p, int prec)
 {
-       char *t = (char *)s;
-       while (isspace(*t)) t++;
        FILE f = {
-               .buf = (void *)t, .rpos = (void *)t,
+               .buf = (void *)s, .rpos = (void *)s,
                .rend = (void *)-1, .lock = -1
        };
        shlim(&f, 0);
-       long double y = __floatscan(&f, -1, prec, 1);
+       long double y = __floatscan(&f, prec, 1);
        off_t cnt = shcnt(&f);
-       if (p) *p = cnt ? t + cnt : (char *)s;
+       if (p) *p = cnt ? (char *)s + cnt : (char *)s;
        return y;
 }