mirror of
https://github.com/sheumann/hush.git
synced 2024-12-21 23:29:34 +00:00
num conversions: allow for leading '+' (renice needs that)
This commit is contained in:
parent
d7e2e127a9
commit
2cd4a747e5
@ -21,9 +21,8 @@ unsigned type xstrtou(_range_sfx)(const char *numstr, int base,
|
|||||||
int old_errno;
|
int old_errno;
|
||||||
char *e;
|
char *e;
|
||||||
|
|
||||||
/* Disallow '-' and any leading whitespace. Speed isn't critical here
|
/* Disallow '-' and any leading whitespace. Make sure we get the
|
||||||
* since we're parsing commandline args. So make sure we get the
|
* actual isspace function rather than a macro implementaion. */
|
||||||
* actual isspace function rather than a lnumstrer macro implementaion. */
|
|
||||||
if (*numstr == '-' || *numstr == '+' || (isspace)(*numstr))
|
if (*numstr == '-' || *numstr == '+' || (isspace)(*numstr))
|
||||||
goto inval;
|
goto inval;
|
||||||
|
|
||||||
@ -127,9 +126,12 @@ type xstrto(_range_sfx)(const char *numstr, int base,
|
|||||||
type r;
|
type r;
|
||||||
const char *p = numstr;
|
const char *p = numstr;
|
||||||
|
|
||||||
if (p[0] == '-') {
|
/* NB: if you'll decide to disallow '+':
|
||||||
|
* at least renice applet needs to allow it */
|
||||||
|
if (p[0] == '+' || p[0] == '-') {
|
||||||
++p;
|
++p;
|
||||||
++u; /* two's complement */
|
if (p[0] == '-')
|
||||||
|
++u; /* = <type>_MIN (01111... + 1 == 10000...) */
|
||||||
}
|
}
|
||||||
|
|
||||||
r = xstrtou(_range_sfx)(p, base, 0, u, suffixes);
|
r = xstrtou(_range_sfx)(p, base, 0, u, suffixes);
|
||||||
|
Loading…
Reference in New Issue
Block a user