}
for (x=0; c-'0'<10U && x<INT_MAX/10; c = shgetc(f))
x = 10*x + c-'0';
- for (y=x; c-'0'<10U && x<LLONG_MAX/100; c = shgetc(f))
+ for (y=x; c-'0'<10U && y<LLONG_MAX/100; c = shgetc(f))
y = 10*y + c-'0';
for (; c-'0'<10U; c = shgetc(f));
shunget(f);
uint32_t x[KMAX];
static const uint32_t th[] = { LD_B1B_MAX };
int i, j, k, a, z;
- long long lrp=-1, dc=0;
+ long long lrp=0, dc=0;
long long e10=0;
int lnz = 0;
- int gotdig = 0;
+ int gotdig = 0, gotrad = 0;
int rp;
int e2;
long double y;
/* Don't let leading zeros consume buffer space */
for (; c=='0'; c = shgetc(f)) gotdig=1;
+ if (c=='.') {
+ gotrad = 1;
+ for (c = shgetc(f); c=='0'; c = shgetc(f)) gotdig=1, lrp--;
+ }
x[0] = 0;
for (; c-'0'<10U || c=='.'; c = shgetc(f)) {
if (c == '.') {
- if (lrp!=-1) break;
+ if (gotrad) break;
+ gotrad = 1;
lrp = dc;
} else if (k < KMAX-2) {
- if (c!='0') lnz = dc;
dc++;
+ if (c!='0') lnz = dc;
if (j) x[k] = x[k]*10 + c-'0';
else x[k] = c-'0';
if (++j==9) {
if (c!='0') x[KMAX-3] |= 1;
}
}
- if (lrp==-1) lrp=dc;
+ if (!gotrad) lrp=dc;
if (gotdig && (c|32)=='e') {
e10 = scanexp(f, 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:
return 0;
}
- if (c<0) c = shgetc(f);
+ while (isspace((c=shgetc(f))));
if (c=='+' || c=='-') {
sign -= 2*(c=='-');
for (i=0; i<8 && (c|32)=="infinity"[i]; i++)
if (i<7) c = shgetc(f);
if (i==3 || i==8 || (i>3 && pok)) {
- if (i==3) shunget(f);
- if (pok) for (; i>3; i--) shunget(f);
- else shlim(f, 0);
+ if (i!=8) {
+ shunget(f);
+ if (pok) for (; i>3; i--) shunget(f);
+ }
return sign * INFINITY;
}
if (!i) for (i=0; i<3 && (c|32)=="nan"[i]; i++)
- if (i<3) c = shgetc(f);
+ if (i<2) c = shgetc(f);
if (i==3) {
return NAN;
}