diff options
author | Baptiste Daroussin <bapt@FreeBSD.org> | 2015-07-14 19:16:14 +0000 |
---|---|---|
committer | Baptiste Daroussin <bapt@FreeBSD.org> | 2015-07-14 19:16:14 +0000 |
commit | cffa7aa609d71f7229d7f616a51d6d76b307e210 (patch) | |
tree | dbc83e957ba5989564101a3b16d061fa3b610a74 /usr.bin/xargs | |
parent | f3856d8fcb79386ed0c7f302cd2149a65036de88 (diff) | |
download | src-cffa7aa609d71f7229d7f616a51d6d76b307e210.tar.gz src-cffa7aa609d71f7229d7f616a51d6d76b307e210.zip |
Convert atoi(3) to stronum(3) which allows to arguments and report proper errors
to the users
Obtained from: OpenBSD
Notes
Notes:
svn path=/head/; revision=285552
Diffstat (limited to 'usr.bin/xargs')
-rw-r--r-- | usr.bin/xargs/xargs.c | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/usr.bin/xargs/xargs.c b/usr.bin/xargs/xargs.c index 6bd3e9fd46fb..b95c7d47bb60 100644 --- a/usr.bin/xargs/xargs.c +++ b/usr.bin/xargs/xargs.c @@ -101,6 +101,7 @@ main(int argc, char *argv[]) int ch, Jflag, nargs, nflag, nline; size_t linelen; char *endptr; + const char *errstr; inpline = replstr = NULL; ep = environ; @@ -148,19 +149,23 @@ main(int argc, char *argv[]) replstr = optarg; break; case 'L': - Lflag = atoi(optarg); + Lflag = strtonum(optarg, 0, INT_MAX, &errstr); + if (errstr) + errx(1, "-L %s: %s", optarg, errstr); break; case 'n': nflag = 1; - if ((nargs = atoi(optarg)) <= 0) - errx(1, "illegal argument count"); + nargs = strtonum(optarg, 1, INT_MAX, &errstr); + if (errstr) + errx(1, "-n %s: %s", optarg, errstr); break; case 'o': oflag = 1; break; case 'P': - if ((maxprocs = atoi(optarg)) <= 0) - errx(1, "max. processes must be >0"); + maxprocs = strtonum(optarg, 1, INT_MAX, &errstr); + if (errstr) + errx(1, "-P %s: %s", optarg, errstr); break; case 'p': pflag = 1; @@ -179,7 +184,9 @@ main(int argc, char *argv[]) errx(1, "replsize must be a number"); break; case 's': - nline = atoi(optarg); + nline = strtonum(optarg, 0, INT_MAX, &errstr); + if (errstr) + errx(1, "-s %s: %s", optarg, errstr); break; case 't': tflag = 1; |