unify strtof/strtod/strtold wrappers and fix initial whitespace issue

3 files changed, 21 insertions, 34 deletions

diff --git a/src/stdlib/strtod.c b/src/stdlib/strtod.c
index 98b992a1..b444f530 100644
--- a/src/stdlib/strtod.c
+++ b/src/stdlib/strtod.c
@@ -2,14 +2,31 @@
 #include "floatscan.h"
 #include "stdio_impl.h"
 
-double strtod(const char *s, char **p)
+static long double strtox(const char *s, char **p, int prec)
 {
+	char *t = (char *)s;
+	while (isspace(*t)) t++;
 	FILE f = {
-		.buf = (void *)s, .rpos = (void *)s,
+		.buf = (void *)t, .rpos = (void *)t,
 		.rend = (void *)-1, .lock = -1
 	};
 	off_t cnt;
-	double y = __floatscan(&f, -1, 1, 1, &cnt);
-	if (p) *p = (char *)s + cnt;
+	long double y = __floatscan(&f, -1, prec, 1, &cnt);
+	if (p) *p = cnt ? t + cnt : (char *)s;
 	return y;
 }
+
+float strtof(const char *s, char **p)
+{
+	return strtox(s, p, 0);
+}
+
+double strtod(const char *s, char **p)
+{
+	return strtox(s, p, 1);
+}
+
+long double strtold(const char *s, char **p)
+{
+	return strtox(s, p, 2);
+}
diff --git a/src/stdlib/strtof.c b/src/stdlib/strtof.c
deleted file mode 100644
index 2dc349a9..00000000
--- a/src/stdlib/strtof.c
+++ /dev/null
@@ -1,15 +0,0 @@
-#include <stdlib.h>
-#include "floatscan.h"
-#include "stdio_impl.h"
-
-float strtof(const char *s, char **p)
-{
-	FILE f = {
-		.buf = (void *)s, .rpos = (void *)s,
-		.rend = (void *)-1, .lock = -1
-	};
-	off_t cnt;
-	float y = __floatscan(&f, -1, 0, 1, &cnt);
-	if (p) *p = (char *)s + cnt;
-	return y;
-}
diff --git a/src/stdlib/strtold.c b/src/stdlib/strtold.c
deleted file mode 100644
index 40ecc122..00000000
--- a/src/stdlib/strtold.c
+++ /dev/null
@@ -1,15 +0,0 @@
-#include <stdlib.h>
-#include "floatscan.h"
-#include "stdio_impl.h"
-
-long double strtold(const char *s, char **p)
-{
-	FILE f = {
-		.buf = (void *)s, .rpos = (void *)s,
-		.rend = (void *)-1, .lock = -1
-	};
-	off_t cnt;
-	long double y = __floatscan(&f, -1, 2, 1, &cnt);
-	if (p) *p = (char *)s + cnt;
-	return y;
-}