From c56ee6b0c20eaf721c4b2493222552adb193f8c8 Mon Sep 17 00:00:00 2001 From: eadler Date: Sat, 9 Nov 2013 08:57:21 +0000 Subject: Change manual string conversion to expand_number Reviewed by: adrian --- usr.bin/split/split.c | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) (limited to 'usr.bin/split/split.c') diff --git a/usr.bin/split/split.c b/usr.bin/split/split.c index 572af59..9a0b0ec 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 #include #include +#include #include #include #include @@ -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; -- cgit v1.1