It's not really possible to make strtonum() deal with unsigned long

long values properly so don't bother trying.  This greatly simplifies
the code.  tedu@ OK with input from otto@ and others.

1 files changed, 10 insertions, 27 deletions

diff --git a/src/lib/libc/stdlib/strtonum.c b/src/lib/libc/stdlib/strtonum.c
index a2dfed25ca..e426388ed0 100644
--- a/src/lib/libc/stdlib/strtonum.c
+++ b/src/lib/libc/stdlib/strtonum.c
@@ -1,4 +1,5 @@
-/* $OpenBSD: strtonum.c,v 1.5 2004/07/16 18:36:05 otto Exp $ */
+/*      $OpenBSD: strtonum.c,v 1.6 2004/08/03 19:38:01 millert Exp $    */
+
 /*
  * Copyright (c) 2004 Ted Unangst and Todd Miller
  * All rights reserved.
@@ -24,12 +25,11 @@
 #define TOOSMALL        2
 #define TOOLARGE        3
 
-unsigned long long
-strtonum(const char *numstr, long long minval, unsigned long long umaxval,
+long long
+strtonum(const char *numstr, long long minval, long long maxval,
     const char **errstrp)
 {
-        long long ll, maxval = (long long)umaxval;
-        unsigned long long ull = 0;
+        long long ll = 0;
         char *ep;
         int error = 0;
         struct errval {
@@ -44,24 +44,9 @@ strtonum(const char *numstr, long long minval, unsigned long long umaxval,
 
         ev[0].err = errno;
         errno = 0;
-        if (umaxval > LLONG_MAX ) {
-                if (minval < 0) {
-                        error = INVALID;
-                        goto done;
-                }
-                ull = strtoull(numstr, &ep, 10);
-                if (numstr == ep || *ep != '\0')
-                        error = INVALID;
-                else if ((ull == ULLONG_MAX && errno == ERANGE) ||
-                    ull > umaxval)
-                        error = TOOLARGE;
-                else if (ull < minval)
-                        error = TOOSMALL;
-        } else {
-                if (minval > maxval || maxval < minval) {
-                        error = INVALID;
-                        goto done;
-                }
+        if (minval > maxval)
+                error = INVALID;
+        else {
                 ll = strtoll(numstr, &ep, 10);
                 if (numstr == ep || *ep != '\0')
                         error = INVALID;
@@ -69,14 +54,12 @@ strtonum(const char *numstr, long long minval, unsigned long long umaxval,
                         error = TOOSMALL;
                 else if ((ll == LLONG_MAX && errno == ERANGE) || ll > maxval)
                         error = TOOLARGE;
-                ull = (unsigned long long)ll;
         }
-done:
         if (errstrp != NULL)
                 *errstrp = ev[error].errstr;
         errno = ev[error].err;
         if (error)
-                ull = 0;
+                ll = 0;
 
-        return (ull);
+        return (ll);
 }