X-Git-Url: http://nsz.repo.hu/git/?p=musl;a=blobdiff_plain;f=src%2Finternal%2Ffloatscan.c;h=6390d46a1372089e41c82c0931a1eb7dd4058642;hp=7d9a452412592a06955e2f4cf7aeeb1cd004a4b6;hb=5837a0bb6b5cf516f79527e837368af0b494d51a;hpb=2162541f38d3f642f5a643010548d62220d55a4d

diff --git a/src/internal/floatscan.c b/src/internal/floatscan.c
index 7d9a4524..6390d46a 100644
--- a/src/internal/floatscan.c
+++ b/src/internal/floatscan.c
@@ -3,6 +3,7 @@
 #include <math.h>
 #include <float.h>
 #include <limits.h>
+#include <errno.h>
 
 #include "shgetc.h"
 #include "floatscan.h"
@@ -43,7 +44,7 @@ static long long scanexp(FILE *f, int pok)
 	}
 	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/10; c = shgetc(f))
+	for (y=x; c-'0'<10U && x<LLONG_MAX/100; c = shgetc(f))
 		y = 10*y + c-'0';
 	for (; c-'0'<10U; c = shgetc(f));
 	shunget(f);
@@ -51,7 +52,7 @@ static long long scanexp(FILE *f, int pok)
 }
 
 
-static long double decfloat(FILE *f, int bits, int emin, int sign, int pok)
+static long double decfloat(FILE *f, int c, int bits, int emin, int sign, int pok)
 {
 	uint32_t x[KMAX];
 	static const uint32_t th[] = { LD_B1B_MAX };
@@ -64,13 +65,10 @@ static long double decfloat(FILE *f, int bits, int emin, int sign, int pok)
 	long double y;
 	long double frac=0;
 	long double bias=0;
-	int c;
 
 	j=0;
 	k=0;
 
-	c = shgetc(f);
-
 	/* Don't let leading zeros consume buffer space */
 	for (; c=='0'; c = shgetc(f)) gotdig=1;
 
@@ -79,7 +77,7 @@ static long double decfloat(FILE *f, int bits, int emin, int sign, int pok)
 		if (c == '.') {
 			if (lrp!=-1) break;
 			lrp = dc;
-		} else if (k < KMAX) {
+		} else if (k < KMAX-2) {
 			dc++;
 			if (j) x[k] = x[k]*10 + c-'0';
 			else x[k] = c-'0';
@@ -90,7 +88,7 @@ static long double decfloat(FILE *f, int bits, int emin, int sign, int pok)
 			gotdig=1;
 		} else {
 			dc++;
-			x[KMAX-1] |= c-'0';
+			if (c!='0') x[KMAX-3] |= 1;
 		}
 	}
 	if (lrp==-1) lrp=dc;
@@ -111,6 +109,7 @@ static long double decfloat(FILE *f, int bits, int emin, int sign, int pok)
 		shunget(f);
 	}
 	if (!gotdig) {
+		errno = EINVAL;
 		shlim(f, 0);
 		return 0;
 	}
@@ -119,10 +118,14 @@ static long double decfloat(FILE *f, int bits, int emin, int sign, int pok)
 		return sign * 0.0;
 	if (lrp==dc && (!k || (k==1 && !j)) && (bits>30 || x[0]>>bits==0))
 		return sign * (long double)x[0];
-	if (lrp > -emin/2)
+	if (lrp > -emin/2) {
+		errno = ERANGE;
 		return sign * LDBL_MAX * LDBL_MAX;
-	if (lrp < emin-2*LDBL_MANT_DIG)
+	}
+	if (lrp < emin-2*LDBL_MANT_DIG) {
+		errno = ERANGE;
 		return sign * LDBL_MIN * LDBL_MIN;
+	}
 
 	if (k<KMAX && j) {
 		for (; j<9; j++) x[k]*=10;
@@ -135,7 +138,28 @@ static long double decfloat(FILE *f, int bits, int emin, int sign, int pok)
 	e2 = 0;
 	rp = lrp;
 
-	while (rp < 18+9*LD_B1B_DIG) {
+	if (rp % 9) {
+		static const int p10s[] = {
+			100000000, 10000000, 1000000, 100000,
+			10000, 1000, 100, 10
+		};
+		int rpm9 = rp>=0 ? rp%9 : rp%9+9;
+		int p10 = p10s[rpm9-1];
+		uint32_t carry = 0;
+		for (k=a; k!=z; k++) {
+			uint32_t tmp = x[k] % p10;
+			x[k] = x[k]/p10 + carry;
+			carry = 1000000000/p10 * tmp;
+			if (k==a && !x[k]) {
+				a = (a+1 & MASK);
+				rp -= 9;
+			}
+		}
+		if (carry) x[z++] = carry;
+		rp += 9-rpm9;
+	}
+
+	while (rp < 9*LD_B1B_DIG || (rp == 9*LD_B1B_DIG && x[0]<th[0])) {
 		uint32_t carry = 0;
 		e2 -= 29;
 		for (k=(z-1 & MASK); ; k=(k-1 & MASK)) {
@@ -161,32 +185,6 @@ static long double decfloat(FILE *f, int bits, int emin, int sign, int pok)
 		}
 	}
 
-	if (rp % 9) {
-		static const int p10s[] = {
-			100000000, 10000000, 1000000, 100000,
-			10000, 1000, 100, 10
-		};
-		int rpm9 = rp % 9;
-		int p10 = p10s[rpm9-1];
-		uint32_t carry = 0;
-		for (k=a; k!=z; k=(k+1 & MASK)) {
-			uint32_t tmp = x[k] % p10;
-			x[k] = x[k]/p10 + carry;
-			carry = 1000000000/p10 * tmp;
-			if (k==a && !x[k]) {
-				a = (a+1 & MASK);
-				rp -= 9;
-			}
-		}
-		if (carry) {
-			if ((z+1 & MASK) != a) {
-				x[z] = carry;
-				z = (z+1 & MASK);
-			} else x[z-1 & MASK] |= 1;
-		}
-		rp += 9-rpm9;
-	}
-
 	for (;;) {
 		uint32_t carry = 0;
 		int sh = 1;
@@ -219,8 +217,10 @@ static long double decfloat(FILE *f, int bits, int emin, int sign, int pok)
 		}
 	}
 
-	for (y=i=0; i<LD_B1B_DIG && (a+i & MASK)!=z; i++)
+	for (y=i=0; i<LD_B1B_DIG; i++) {
+		if ((a+i & MASK)==z) x[z=(z+1 & MASK)] = 0;
 		y = 1000000000.0L * y + x[a+i & MASK];
+	}
 
 	y *= sign;
 
@@ -257,6 +257,8 @@ static long double decfloat(FILE *f, int bits, int emin, int sign, int pok)
 
 	y = scalbnl(y, e2);
 
+	if (!y) errno = ERANGE;
+
 	return y;
 }
 
@@ -328,12 +330,20 @@ static long double hexfloat(FILE *f, int bits, int emin, int sign, int pok)
 			}
 			e2 = 0;
 		}
+	} else {
+		shunget(f);
 	}
 	e2 += 4*rp - 32;
 
 	if (!x) return sign * 0.0;
-	if (e2 > -emin) return sign * LDBL_MAX * LDBL_MAX;
-	if (e2 < emin-2*LDBL_MANT_DIG) return sign * LDBL_MIN * LDBL_MIN;
+	if (e2 > -emin) {
+		errno = ERANGE;
+		return sign * LDBL_MAX * LDBL_MAX;
+	}
+	if (e2 < emin-2*LDBL_MANT_DIG) {
+		errno = ERANGE;
+		return sign * LDBL_MIN * LDBL_MIN;
+	}
 
 	while (x < 0x80000000) {
 		if (y>=0.5) {
@@ -359,6 +369,8 @@ static long double hexfloat(FILE *f, int bits, int emin, int sign, int pok)
 	y = bias + sign*(long double)x + sign*y;
 	y -= bias;
 
+	if (!y) errno = ERANGE;
+
 	return scalbnl(y, e2);
 }
 
@@ -409,6 +421,7 @@ long double __floatscan(FILE *f, int c, int prec, int pok)
 
 	if (i) {
 		shunget(f);
+		errno = EINVAL;
 		shlim(f, 0);
 		return 0;
 	}
@@ -417,9 +430,9 @@ long double __floatscan(FILE *f, int c, int prec, int pok)
 		c = shgetc(f);
 		if ((c|32) == 'x')
 			return hexfloat(f, bits, emin, sign, pok);
+		shunget(f);
 		c = '0';
 	}
 
-	shunget(f);
-	return decfloat(f, bits, emin, sign, pok);
+	return decfloat(f, c, bits, emin, sign, pok);
 }