d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve strtounum

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

Submitted by:	bde
This commit is contained in:
Baptiste Daroussin 2015-07-30 06:14:47 +00:00
parent a5c1653b5c
commit a86e343db6
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=286066
2 changed files with 25 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
usr.sbin/pw/pw.h
View File

@ -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);

49
usr.sbin/pw/strtounum.c
View File

@ -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;
return (0);
} else if ((ret == 0 && errno == ERANGE) || ret < minval) {
errno = ERANGE;
if (errstrp != NULL)
*errstrp = TOOSMALL;
return (0);
} else if ((ret == UINTMAX_MAX && errno == ERANGE) || ret > maxval) {
errno = ERANGE;
if (errstrp != NULL)
*errstrp = TOOLARGE;
if (errpp != NULL)
*errpp = "invalid";
return (0);
}
if (ret < minval) {
errno = ERANGE;
if (errpp != NULL)
*errpp = "too small";
return (0);
}
if (errno == ERANGE || ret > maxval) {
errno = ERANGE;
if (errpp != NULL)
*errpp = "too large";
return (0);
}
return (ret);
}