X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Fstdlib%2Fstrtol.c;h=7ee88794bdac5aac1c3cb6a6b39114def944d8f9;hb=1d92cddb1e1ed4b6cc0e55461727561e7a2522e0;hp=ace820afef89a3895343e332fb7d2db4e4068bdd;hpb=0b44a0315b47dd8eced9f3b7f31580cf14bbfc01;p=musl

diff --git a/src/stdlib/strtol.c b/src/stdlib/strtol.c
index ace820af..7ee88794 100644
--- a/src/stdlib/strtol.c
+++ b/src/stdlib/strtol.c
@@ -1,17 +1,56 @@
-#include <stdlib.h>
+#include "stdio_impl.h"
+#include "intscan.h"
+#include "shgetc.h"
 #include <inttypes.h>
-#include <errno.h>
 #include <limits.h>
+#include <ctype.h>
 
-long strtol(const char *s, char **p, int base)
+static unsigned long long strtox(const char *s, char **p, int base, unsigned long long lim)
 {
-	intmax_t x = strtoimax(s, p, base);
-	if (x > LONG_MAX) {
-		errno = ERANGE;
-		return LONG_MAX;
-	} else if (x < LONG_MIN) {
-		errno = ERANGE;
-		return LONG_MIN;
+	/* FIXME: use a helper function or macro to setup the FILE */
+	FILE f;
+	f.flags = 0;
+	f.buf = f.rpos = (void *)s;
+	if ((size_t)s > (size_t)-1/2)
+		f.rend = (void *)-1;
+	else
+		f.rend = (unsigned char *)s+(size_t)-1/2;
+	f.lock = -1;
+	shlim(&f, 0);
+	unsigned long long y = __intscan(&f, base, 1, lim);
+	if (p) {
+		size_t cnt = shcnt(&f);
+		*p = (char *)s + cnt;
 	}
-	return x;
+	return y;
+}
+
+unsigned long long strtoull(const char *restrict s, char **restrict p, int base)
+{
+	return strtox(s, p, base, ULLONG_MAX);
+}
+
+long long strtoll(const char *restrict s, char **restrict p, int base)
+{
+	return strtox(s, p, base, LLONG_MIN);
+}
+
+unsigned long strtoul(const char *restrict s, char **restrict p, int base)
+{
+	return strtox(s, p, base, ULONG_MAX);
+}
+
+long strtol(const char *restrict s, char **restrict p, int base)
+{
+	return strtox(s, p, base, 0UL+LONG_MIN);
+}
+
+intmax_t strtoimax(const char *restrict s, char **restrict p, int base)
+{
+	return strtoll(s, p, base);
+}
+
+uintmax_t strtoumax(const char *restrict s, char **restrict p, int base)
+{
+	return strtoull(s, p, base);
 }