diff options
author | Cameron Katri <me@cameronkatri.com> | 2021-05-23 11:50:48 -0400 |
---|---|---|
committer | Cameron Katri <me@cameronkatri.com> | 2021-05-23 11:50:48 -0400 |
commit | 6049e2ca2a32bf3cd895ac1279495d4bf61c638d (patch) | |
tree | 5eead04e146929ed3adc3941717671944cff58ea /shell_cmds/xargs | |
parent | a5d67cf8b3beb8310964dc989d6bc95ac6503fe9 (diff) | |
download | apple_cmds-6049e2ca2a32bf3cd895ac1279495d4bf61c638d.tar.gz apple_cmds-6049e2ca2a32bf3cd895ac1279495d4bf61c638d.tar.zst apple_cmds-6049e2ca2a32bf3cd895ac1279495d4bf61c638d.zip |
shell_cmds: Fix compilation for lower targets
Diffstat (limited to 'shell_cmds/xargs')
-rw-r--r-- | shell_cmds/xargs/Makefile | 2 | ||||
-rw-r--r-- | shell_cmds/xargs/strtonum.c | 68 | ||||
-rw-r--r-- | shell_cmds/xargs/xargs.c | 2 |
3 files changed, 71 insertions, 1 deletions
diff --git a/shell_cmds/xargs/Makefile b/shell_cmds/xargs/Makefile index a316efb..d7f3518 100644 --- a/shell_cmds/xargs/Makefile +++ b/shell_cmds/xargs/Makefile @@ -1,5 +1,5 @@ PROG= xargs -SRCS= strnsubst.c xargs.c +SRCS= strnsubst.c xargs.c strtonum.c LDADD+=-liosexec diff --git a/shell_cmds/xargs/strtonum.c b/shell_cmds/xargs/strtonum.c new file mode 100644 index 0000000..aa433d8 --- /dev/null +++ b/shell_cmds/xargs/strtonum.c @@ -0,0 +1,68 @@ +/*- + * Copyright (c) 2004 Ted Unangst and Todd Miller + * All rights reserved. + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + * + * $OpenBSD: strtonum.c,v 1.7 2013/04/17 18:40:58 tedu Exp $ + */ + +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + +#include <errno.h> +#include <limits.h> +#include <stdlib.h> + +#define INVALID 1 +#define TOOSMALL 2 +#define TOOLARGE 3 + +long long +strtonum(const char *numstr, long long minval, long long maxval, + const char **errstrp) +{ + long long ll = 0; + int error = 0; + char *ep; + struct errval { + const char *errstr; + int err; + } ev[4] = { + { NULL, 0 }, + { "invalid", EINVAL }, + { "too small", ERANGE }, + { "too large", ERANGE }, + }; + + ev[0].err = errno; + errno = 0; + if (minval > maxval) { + error = INVALID; + } else { + ll = strtoll(numstr, &ep, 10); + if (errno == EINVAL || numstr == ep || *ep != '\0') + error = INVALID; + else if ((ll == LLONG_MIN && errno == ERANGE) || ll < minval) + error = TOOSMALL; + else if ((ll == LLONG_MAX && errno == ERANGE) || ll > maxval) + error = TOOLARGE; + } + if (errstrp != NULL) + *errstrp = ev[error].errstr; + errno = ev[error].err; + if (error) + ll = 0; + + return (ll); +} diff --git a/shell_cmds/xargs/xargs.c b/shell_cmds/xargs/xargs.c index 1b71a6d..7865be3 100644 --- a/shell_cmds/xargs/xargs.c +++ b/shell_cmds/xargs/xargs.c @@ -75,6 +75,8 @@ __FBSDID("$FreeBSD$"); #define COMPAT_MODE(a,b) (1) #endif /* __APPLE__ */ +long long strtonum(const char*, long long, long long, const char**); + static void parse_input(int, char *[]); static void prerun(int, char *[]); static int prompt(void); |