Implementation of strto(u)ll, documentation and tests for strto(u)l(l)

lib/other/Makefile.in

@@ -86,6 +86,7 @@ libc_FILES=" \
 	strlcat.c \
 	strlcpy.c \
 	strtok_r.c \
+	strtoll.c \
 	swab.c \
 	sys_eniop.c \
 	syscall.c \

lib/other/strtoll.c

@@ -0,0 +1,99 @@
+/* Erik van der Kouwe, 8 December 2009, based on lib/ansi/strtol.c */
+
+#include	<ctype.h>
+#include	<errno.h>
+#include	<limits.h>
+#include	<stdint.h>
+#include	<stdlib.h>
+
+#ifdef __LONG_LONG_SUPPORTED
+
+static unsigned long long string2long(const char *nptr, char **endptr,
+	int base, int is_signed);
+
+long long strtoll(const char *nptr, char **endptr, int base)
+{
+	return (long long) string2long(nptr, endptr, base, 1);
+}
+
+unsigned long long strtoull(const char *nptr, char **endptr, int base)
+{
+	return (unsigned long long) string2long(nptr, endptr, base, 0);
+}
+
+#define between(a, c, z) \
+	((unsigned long) ((c) - (a)) <= (unsigned long) ((z) - (a)))
+
+static unsigned long long string2long(const char *nptr, char **const endptr,
+	int base, int is_signed)
+{
+	unsigned int v;
+	unsigned long long val = 0;
+	int c;
+	int ovfl = 0, sign = 1;
+	const char *startnptr = nptr, *nrstart;
+
+	if (endptr) *endptr = (char *)nptr;
+	while (isspace(*nptr)) nptr++;
+	c = *nptr;
+
+	if (c == '-' || c == '+') {
+		if (c == '-') sign = -1;
+		nptr++;
+	}
+	nrstart = nptr;			/* start of the number */
+
+	/* When base is 0, the syntax determines the actual base */
+	if (base == 0)
+		if (*nptr == '0')
+			if (*++nptr == 'x' || *nptr == 'X') {
+				base = 16;
+				nptr++;
+			}
+			else	base = 8;
+		else	base = 10;
+	else if (base==16 && *nptr=='0' && (*++nptr =='x' || *nptr =='X'))
+		nptr++;
+
+	for (;;) {
+		c = *nptr;
+		if (between('0', c, '9')) {
+			v = c - '0';
+		} else
+		if (between('a', c, 'z')) {
+			v = c - 'a' + 0xa;
+		} else
+		if (between('A', c, 'Z')) {
+			v = c - 'A' + 0xA;
+		} else {
+			break;
+		}
+		if (v >= base) break;
+		if (val > (ULLONG_MAX - v) / base) ovfl++;
+		val = (val * base) + v;
+		nptr++;
+	}
+	if (endptr) {
+		if (nrstart == nptr) *endptr = (char *)startnptr;
+		else *endptr = (char *)nptr;
+	}
+
+	if (!ovfl) {
+		/* Overflow is only possible when converting a signed long. */
+		if (is_signed
+		    && ((sign < 0 && val > -(unsigned long long)LLONG_MIN)
+			|| (sign > 0 && val > LLONG_MAX)))
+		    ovfl++;
+	}
+
+	if (ovfl) {
+		errno = ERANGE;
+		if (is_signed)
+			if (sign < 0) return LLONG_MIN;
+			else return LLONG_MAX;
+		else return ULLONG_MAX;
+	}
+	return (long) sign * val;
+}
+
+#endif /* defined(__LONG_LONG_SUPPORTED) */