Improve strtounum

Fix many style bugs
Better variable naming
Use C99 'restrict' were apropriate
Fix potential errno race

Submitted by:	bde

diff --git a/pw/pw.h b/pw/pw.h
index 3ab3c74a953725ee47536f9dfc50f4a872952ed2..a22572e57cab0c29022c183ca58fd00181aa0c41 100644 (file)
--- a/pw/pw.h
+++ b/pw/pw.h
@@ -103,5 +103,5 @@ char *pw_pwcrypt(char *password);
 extern const char *Modes[];
 extern const char *Which[];
 
-uintmax_t strtounum(const char *numstr, uintmax_t minval, uintmax_t maxval,
-    const char **errmsg);
+uintmax_t strtounum(const char * __restrict, uintmax_t, uintmax_t,
+    const char ** __restrict);

diff --git a/pw/strtounum.c b/pw/strtounum.c
index b3944865346c332893d4ea777466bf59ac8fda94..8d8347080ac2d1ce329683cd9c7c3859538b14e0 100644 (file)
--- a/pw/strtounum.c
+++ b/pw/strtounum.c
@@ -34,41 +34,38 @@ __FBSDID("$FreeBSD$");
 
 #include "pw.h"
 
-#define INVALID                "invalid"
-#define TOOSMALL       "too small"
-#define        TOOLARGE        "too large"
-
 uintmax_t
-strtounum(const char *numstr, uintmax_t minval, uintmax_t maxval,
-    const char **errstrp)
+strtounum(const char * __restrict np, uintmax_t minval, uintmax_t maxval,
+    const char ** __restrict errpp)
 {
-       uintmax_t ret = 0;
-       char *ep;
+       char *endp;
+       uintmax_t ret;
 
        if (minval > maxval) {
                errno = EINVAL;
-               if (errstrp != NULL)
-                       *errstrp = INVALID;
+               if (errpp != NULL)
+                       *errpp = "invalid";
                return (0);
        }
-
-       ret = strtoumax(numstr, &ep, 10);
-       if (errno == EINVAL || numstr == ep || *ep != '\0') {
+       errno = 0;
+       ret = strtoumax(np, &endp, 10);
+       if (endp == np || *endp != '\0') {
                errno = EINVAL;
-               if (errstrp != NULL)
-                       *errstrp = INVALID;
+               if (errpp != NULL)
+                       *errpp = "invalid";
                return (0);
-       } else if ((ret == 0 && errno == ERANGE) || ret < minval) {
+       }
+       if (ret < minval) {
                errno = ERANGE;
-               if (errstrp != NULL)
-                       *errstrp = TOOSMALL;
+               if (errpp != NULL)
+                       *errpp = "too small";
                return (0);
-       } else if ((ret == UINTMAX_MAX && errno == ERANGE) || ret > maxval) {
+       }
+       if (errno == ERANGE || ret > maxval) {
                errno = ERANGE;
-               if (errstrp != NULL)
-                       *errstrp = TOOLARGE;
+               if (errpp != NULL)
+                       *errpp = "too large";
                return (0);
        }
-
        return (ret);
 }