From owner-svn-src-head@FreeBSD.ORG  Sat Nov  9 08:57:22 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 6CF01851;
 Sat,  9 Nov 2013 08:57:22 +0000 (UTC)
 (envelope-from eadler@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 412A0226A;
 Sat,  9 Nov 2013 08:57:22 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rA98vMhD092527;
 Sat, 9 Nov 2013 08:57:22 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id rA98vLVM092525;
 Sat, 9 Nov 2013 08:57:21 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201311090857.rA98vLVM092525@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Sat, 9 Nov 2013 08:57:21 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r257884 - head/usr.bin/split
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 09 Nov 2013 08:57:22 -0000

Author: eadler
Date: Sat Nov  9 08:57:21 2013
New Revision: 257884
URL: http://svnweb.freebsd.org/changeset/base/257884

Log:
  Change manual string conversion to expand_number
  
  Reviewed by:	adrian

Modified:
  head/usr.bin/split/Makefile
  head/usr.bin/split/split.c

Modified: head/usr.bin/split/Makefile
==============================================================================
--- head/usr.bin/split/Makefile	Sat Nov  9 08:27:55 2013	(r257883)
+++ head/usr.bin/split/Makefile	Sat Nov  9 08:57:21 2013	(r257884)
@@ -2,5 +2,6 @@
 # $FreeBSD$
 
 PROG=	split
+LDADD=	-lutil
 
 .include <bsd.prog.mk>

Modified: head/usr.bin/split/split.c
==============================================================================
--- head/usr.bin/split/split.c	Sat Nov  9 08:27:55 2013	(r257883)
+++ head/usr.bin/split/split.c	Sat Nov  9 08:57:21 2013	(r257884)
@@ -49,6 +49,7 @@ static const char sccsid[] = "@(#)split.
 #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;