svn commit: trunk/busybox/libbb

[vda at busybox.net]

Author: vda
Date: 2006-11-28 02:54:16 -0800 (Tue, 28 Nov 2006)
New Revision: 16704

Log:
fix bug in new str -> num convertors


Modified:
   trunk/busybox/libbb/bb_strtonum.c


Changeset:
Modified: trunk/busybox/libbb/bb_strtonum.c
===================================================================
--- trunk/busybox/libbb/bb_strtonum.c	2006-11-28 10:06:48 UTC (rev 16703)
+++ trunk/busybox/libbb/bb_strtonum.c	2006-11-28 10:54:16 UTC (rev 16704)
@@ -49,6 +49,7 @@
 
 unsigned long long bb_strtoull(const char *arg, char **endp, int base)
 {
+	unsigned long long v;
 	char *endptr;
 
 	/* strtoul("  -4200000000") returns 94967296, errno 0 (!) */
@@ -57,35 +58,42 @@
 
 	/* not 100% correct for lib func, but convenient for the caller */
 	errno = 0;
-	return handle_errors(strtoull(arg, &endptr, base), endp, endptr);
+	v = strtoull(arg, &endptr, base);
+	return handle_errors(v, endp, endptr);
 }
 
 long long bb_strtoll(const char *arg, char **endp, int base)
 {
+	unsigned long long v;
 	char *endptr;
 
 	if (arg[0] != '-' && !isalnum(arg[0])) return ret_ERANGE();
 	errno = 0;
-	return handle_errors(strtoll(arg, &endptr, base), endp, endptr);
+	v = strtoll(arg, &endptr, base);
+	return handle_errors(v, endp, endptr);
 }
 
 #if ULONG_MAX != ULLONG_MAX
 unsigned long bb_strtoul(const char *arg, char **endp, int base)
 {
+	unsigned long v;
 	char *endptr;
 
 	if (!isalnum(arg[0])) return ret_ERANGE();
 	errno = 0;
-	return handle_errors(strtoul(arg, &endptr, base), endp, endptr);
+	v = strtoul(arg, &endptr, base);
+	return handle_errors(v, endp, endptr);
 }
 
 long bb_strtol(const char *arg, char **endp, int base)
 {
+	long v;
 	char *endptr;
 
 	if (arg[0] != '-' && !isalnum(arg[0])) return ret_ERANGE();
 	errno = 0;
-	return handle_errors(strtol(arg, &endptr, base), endp, endptr);
+	v = strtol(arg, &endptr, base);
+	return handle_errors(v, endp, endptr);
 }
 #endif