PSARC/2008/740 Cross-Platform DDI Interface for Converting Strings to 64-bit Integers

6761505 RFE: having ddi_strtoull() would be nice

--HG--
rename : usr/src/lib/libc/port/gen/strtoll.c => usr/src/common/util/strtoll.c
rename : usr/src/lib/libc/port/gen/strtoull.c => usr/src/common/util/strtoull.c

6 files changed, 12 insertions, 269 deletions

diff --git a/usr/src/lib/libc/amd64/Makefile b/usr/src/lib/libc/amd64/Makefile
index 0d261ea062..5824f3aaa3 100644
--- a/usr/src/lib/libc/amd64/Makefile
+++ b/usr/src/lib/libc/amd64/Makefile
@@ -94,7 +94,9 @@ COMOBJS=			\
 	ffs.o			\
 	qsort.o			\
 	strtol.o		\
-	strtoul.o
+	strtoul.o		\
+	strtoll.o		\
+	strtoull.o
 
 GENOBJS=			\
 	_getsp.o		\
@@ -547,8 +549,6 @@ PORTGEN=			\
 	strtoimax.o		\
 	strtok.o		\
 	strtok_r.o		\
-	strtoll.o		\
-	strtoull.o		\
 	strtoumax.o		\
 	swab.o			\
 	swapctl.o		\
diff --git a/usr/src/lib/libc/i386/Makefile.com b/usr/src/lib/libc/i386/Makefile.com
index 27028899d5..1222822d94 100644
--- a/usr/src/lib/libc/i386/Makefile.com
+++ b/usr/src/lib/libc/i386/Makefile.com
@@ -94,7 +94,9 @@ COMOBJS=			\
 	ffs.o			\
 	qsort.o			\
 	strtol.o		\
-	strtoul.o
+	strtoul.o		\
+	strtoll.o		\
+	strtoull.o
 
 DTRACEOBJS=			\
 	dtrace_data.o
@@ -577,8 +579,6 @@ PORTGEN=			\
 	strtoimax.o		\
 	strtok.o		\
 	strtok_r.o		\
-	strtoll.o		\
-	strtoull.o		\
 	strtoumax.o		\
 	swab.o			\
 	swapctl.o		\
diff --git a/usr/src/lib/libc/port/gen/strtoll.c b/usr/src/lib/libc/port/gen/strtoll.c
deleted file mode 100644
index d594cd9053..0000000000
--- a/usr/src/lib/libc/port/gen/strtoll.c
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License (the "License").
- * You may not use this file except in compliance with the License.
- *
- * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
- * or http://www.opensolaris.org/os/licensing.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
- * If applicable, add the following below this CDDL HEADER, with the
- * fields enclosed by brackets "[]" replaced with your own identifying
- * information: Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- */
-
-/*
- * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
- * Use is subject to license terms.
- */
-
-/*	Copyright (c) 1988 AT&T	*/
-/*	  All Rights Reserved  	*/
-
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-#include "lint.h"
-#include <errno.h>
-#include <ctype.h>
-#include <limits.h>
-#include <sys/types.h>
-#include <stdlib.h>
-
-#define	DIGIT(x)	\
-	(isdigit(x) ? (x) - '0' : islower(x) ? (x) + 10 - 'a' : (x) + 10 - 'A')
-
-#define	MBASE	('z' - 'a' + 1 + 10)
-
-/*
- * The following macro is a local version of isalnum() which limits
- * alphabetic characters to the ranges a-z and A-Z; locale dependent
- * characters will not return 1. The members of a-z and A-Z are
- * assumed to be in ascending order and contiguous
- */
-#define	lisalnum(x)	\
-	(isdigit(x) || ((x) >= 'a' && (x) <= 'z') || ((x) >= 'A' && (x) <= 'Z'))
-
-longlong_t
-strtoll(const char *str, char **nptr, int base)
-{
-	longlong_t val;
-	int c;
-	int xx, neg = 0;
-	longlong_t	multmin;
-	longlong_t	limit;
-	longlong_t	llong_min, llong_max;
-	const char **ptr = (const char **)nptr;
-	const unsigned char	*ustr = (const unsigned char *)str;
-
-	llong_min = LLONG_MIN;   /* from a local version of limits.h */
-	llong_max = LLONG_MAX;
-
-	if (ptr != (const char **)0)
-		*ptr = (char *)ustr; /* in case no number is formed */
-	if (base < 0 || base > MBASE || base == 1) {
-		errno = EINVAL;
-		return (0); /* base is invalid -- should be a fatal error */
-	}
-	if (!isalnum(c = *ustr)) {
-		while (isspace(c))
-			c = *++ustr;
-		switch (c) {
-		case '-':
-			neg++;
-			/* FALLTHROUGH */
-		case '+':
-			c = *++ustr;
-		}
-	}
-	if (base == 0)
-		if (c != '0')
-			base = 10;
-		else if (ustr[1] == 'x' || ustr[1] == 'X')
-			base = 16;
-		else
-			base = 8;
-	/*
-	 * for any base > 10, the digits incrementally following
-	 *	9 are assumed to be "abc...z" or "ABC...Z"
-	 */
-	if (!lisalnum(c) || (xx = DIGIT(c)) >= base)
-		return (0); /* no number formed */
-	if (base == 16 && c == '0' && (ustr[1] == 'x' || ustr[1] == 'X') &&
-	    isxdigit(ustr[2]))
-		c = *(ustr += 2); /* skip over leading "0x" or "0X" */
-
-	/* this code assumes that abs(llong_min) >= abs(llong_max) */
-	if (neg)
-		limit = llong_min;
-	else
-		limit = -llong_max;
-
-	multmin = limit / base;
-
-	val = -DIGIT(c);
-	for (c = *++ustr; lisalnum(c) && (xx = DIGIT(c)) < base; ) {
-		/* accumulate neg avoids surprises near llong_max */
-		if (val < multmin)
-			goto overflow;
-		val *= base;
-		if (val < limit + xx)
-			goto overflow;
-		val -= xx;
-		c = *++ustr;
-	}
-	if (ptr != (const char **)0)
-		*ptr = (char *)ustr;
-	return (neg ? val : -val);
-
-overflow:
-	for (c = *++ustr; lisalnum(c) && (xx = DIGIT(c)) < base; (c = *++ustr))
-		;
-	if (ptr != (const char **)0)
-		*ptr = (char *)ustr;
-	errno = ERANGE;
-	return (neg ? llong_min : llong_max);
-}
diff --git a/usr/src/lib/libc/port/gen/strtoull.c b/usr/src/lib/libc/port/gen/strtoull.c
deleted file mode 100644
index 6d474eded6..0000000000
--- a/usr/src/lib/libc/port/gen/strtoull.c
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License (the "License").
- * You may not use this file except in compliance with the License.
- *
- * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
- * or http://www.opensolaris.org/os/licensing.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
- * If applicable, add the following below this CDDL HEADER, with the
- * fields enclosed by brackets "[]" replaced with your own identifying
- * information: Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- */
-
-/*
- * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
- * Use is subject to license terms.
- */
-
-/*	Copyright (c) 1988 AT&T	*/
-/*	  All Rights Reserved  	*/
-
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-#include "lint.h"
-#include <errno.h>
-#include <ctype.h>
-#include <limits.h>
-#include <sys/types.h>
-#include <stdlib.h>
-
-#define	DIGIT(x)	\
-	(isdigit(x) ? (x) - '0' : islower(x) ? (x) + 10 - 'a' : (x) + 10 - 'A')
-
-#define	MBASE	('z' - 'a' + 1 + 10)
-
-
-/*
- * The following macro is a local version of isalnum() which limits
- * alphabetic characters to the ranges a-z and A-Z; locale dependent
- * characters will not return 1. The members of a-z and A-Z are
- * assumed to be in ascending order and contiguous
- */
-#define	lisalnum(x)	\
-	(isdigit(x) || ((x) >= 'a' && (x) <= 'z') || ((x) >= 'A' && (x) <= 'Z'))
-
-u_longlong_t
-strtoull(const char *str, char **nptr, int base)
-{
-	u_longlong_t val;
-	int c;
-	int xx;
-	u_longlong_t	multmax;
-	u_longlong_t	ullong_max;
-	int neg = 0;
-	const char 	**ptr = (const char **)nptr;
-	const unsigned char	*ustr = (const unsigned char *)str;
-
-	if (ptr != (const char **)0)
-		*ptr = (char *)ustr; /* in case no number is formed */
-
-	ullong_max = ULLONG_MAX;   /* from a local version of limits.h */
-
-	if (base < 0 || base > MBASE || base == 1) {
-		errno = EINVAL;
-		return (0); /* base is invalid -- should be a fatal error */
-	}
-	if (!isalnum(c = *ustr)) {
-		while (isspace(c))
-			c = *++ustr;
-		switch (c) {
-		case '-':
-			neg++;
-			/* FALLTHROUGH */
-		case '+':
-			c = *++ustr;
-		}
-	}
-	if (base == 0)
-		if (c != '0')
-			base = 10;
-		else if (ustr[1] == 'x' || ustr[1] == 'X')
-			base = 16;
-		else
-			base = 8;
-	/*
-	 * for any base > 10, the digits incrementally following
-	 *	9 are assumed to be "abc...z" or "ABC...Z"
-	 */
-	if (!lisalnum(c) || (xx = DIGIT(c)) >= base)
-		return (0); /* no number formed */
-	if (base == 16 && c == '0' && (ustr[1] == 'x' || ustr[1] == 'X') &&
-	    isxdigit(ustr[2]))
-		c = *(ustr += 2); /* skip over leading "0x" or "0X" */
-
-	multmax = ullong_max / (u_longlong_t)base;
-	val = DIGIT(c);
-	for (c = *++ustr; lisalnum(c) && (xx = DIGIT(c)) < base; ) {
-		if (val > multmax)
-			goto overflow;
-		val *= base;
-		if (ullong_max - val < xx)
-			goto overflow;
-		val += xx;
-		c = *++ustr;
-	}
-	if (ptr != (const char **)0)
-		*ptr = (char *)ustr;
-	return (neg ? -val : val);
-
-overflow:
-	for (c = *++ustr; lisalnum(c) && (xx = DIGIT(c)) < base; (c = *++ustr))
-		;
-	if (ptr != (const char **)0)
-		*ptr = (char *)ustr;
-	errno = ERANGE;
-	return (ullong_max);
-}
diff --git a/usr/src/lib/libc/sparc/Makefile b/usr/src/lib/libc/sparc/Makefile
index cc787fcaf1..5b69107630 100644
--- a/usr/src/lib/libc/sparc/Makefile
+++ b/usr/src/lib/libc/sparc/Makefile
@@ -114,7 +114,9 @@ COMOBJS=			\
 	memccpy.o		\
 	qsort.o			\
 	strtol.o		\
-	strtoul.o
+	strtoul.o		\
+	strtoll.o		\
+	strtoull.o
 
 DTRACEOBJS=			\
 	dtrace_data.o
@@ -602,8 +604,6 @@ PORTGEN=			\
 	strtoimax.o		\
 	strtok.o		\
 	strtok_r.o		\
-	strtoll.o		\
-	strtoull.o		\
 	strtoumax.o		\
 	swab.o			\
 	swapctl.o		\
diff --git a/usr/src/lib/libc/sparcv9/Makefile b/usr/src/lib/libc/sparcv9/Makefile
index af36ea9cdd..ca6763246f 100644
--- a/usr/src/lib/libc/sparcv9/Makefile
+++ b/usr/src/lib/libc/sparcv9/Makefile
@@ -118,7 +118,9 @@ COMOBJS=			\
 	memccpy.o		\
 	qsort.o			\
 	strtol.o		\
-	strtoul.o
+	strtoul.o		\
+	strtoll.o		\
+	strtoull.o
 
 GENOBJS=			\
 	_getsp.o		\
@@ -562,8 +564,6 @@ PORTGEN=			\
 	strtoimax.o		\
 	strtok.o		\
 	strtok_r.o		\
-	strtoll.o		\
-	strtoull.o		\
 	strtoumax.o		\
 	swab.o			\
 	swapctl.o		\