diff options
| author | Eitan Adler <eadler@FreeBSD.org> | 2013-11-09 08:57:21 +0000 |
|---|---|---|
| committer | Eitan Adler <eadler@FreeBSD.org> | 2013-11-09 08:57:21 +0000 |
| commit | 3ebd4af7e874c6f71aac128841442c84c1f46bc2 (patch) | |
| tree | 6b901212fae8c1a3a6a9e42f25cc2a78c9c657b6 /usr.bin/split | |
| parent | 2b400c83f248af9cbf2b7c066dfa7e5c68a9c3c7 (diff) | |
Notes
Diffstat (limited to 'usr.bin/split')
| -rw-r--r-- | usr.bin/split/Makefile | 1 | ||||
| -rw-r--r-- | usr.bin/split/split.c | 20 |
2 files changed, 5 insertions, 16 deletions
diff --git a/usr.bin/split/Makefile b/usr.bin/split/Makefile index d176fdd7d457..cf23990f22e4 100644 --- a/usr.bin/split/Makefile +++ b/usr.bin/split/Makefile @@ -2,5 +2,6 @@ # $FreeBSD$ PROG= split +LDADD= -lutil .include <bsd.prog.mk> diff --git a/usr.bin/split/split.c b/usr.bin/split/split.c index 572af5993071..9a0b0ecbe1aa 100644 --- a/usr.bin/split/split.c +++ b/usr.bin/split/split.c @@ -49,6 +49,7 @@ static const char sccsid[] = "@(#)split.c 8.2 (Berkeley) 4/16/94"; #include <errno.h> #include <fcntl.h> #include <inttypes.h> +#include <libutil.h> #include <limits.h> #include <locale.h> #include <stdbool.h> @@ -83,9 +84,8 @@ static void usage(void); int main(int argc, char **argv) { - intmax_t bytecnti; - long scale; int ch; + int error; char *ep, *p; setlocale(LC_ALL, ""); @@ -118,21 +118,9 @@ main(int argc, char **argv) break; case 'b': /* Byte count. */ errno = 0; - if ((bytecnti = strtoimax(optarg, &ep, 10)) <= 0 || - strchr("kKmMgG", *ep) == NULL || errno != 0) - errx(EX_USAGE, - "%s: illegal byte count", optarg); - if (*ep == 'k' || *ep == 'K') - scale = 1024; - else if (*ep == 'm' || *ep == 'M') - scale = 1024 * 1024; - else if (*ep == 'g' || *ep == 'G') - scale = 1024 * 1024 * 1024; - else - scale = 1; - if (bytecnti > OFF_MAX / scale) + error = expand_number(optarg, &bytecnt); + if (error == -1) errx(EX_USAGE, "%s: offset too large", optarg); - bytecnt = (off_t)(bytecnti * scale); break; case 'd': /* Decimal suffix */ dflag = true; |