From: Theodore Ts'o Subject: [PATCH 4/5] mke2fs: teach mke2fs to understand -b 4k and -C 256M Date: Mon, 14 Jan 2013 19:37:11 -0500 Message-ID: <1358210232-30578-4-git-send-email-tytso@mit.edu> References: <20130114211014.GA22642@thunk.org> <1358210232-30578-1-git-send-email-tytso@mit.edu> Cc: gnehzuil.liu@gmail.com, Theodore Ts'o To: Ext4 Developers List Return-path: Received: from li9-11.members.linode.com ([67.18.176.11]:43388 "EHLO imap.thunk.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756761Ab3AOAhT (ORCPT ); Mon, 14 Jan 2013 19:37:19 -0500 In-Reply-To: <1358210232-30578-1-git-send-email-tytso@mit.edu> Sender: linux-ext4-owner@vger.kernel.org List-ID: The -b and -C options now use parse_num_blocks2() insteda of strtol, so that users can specify -C 256M instead of the much less convenient -C 268435456. Signed-off-by: "Theodore Ts'o" --- misc/mke2fs.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/misc/mke2fs.c b/misc/mke2fs.c index 5cb49b3..c16ab33 100644 --- a/misc/mke2fs.c +++ b/misc/mke2fs.c @@ -1324,10 +1324,10 @@ profile_error: "b:cg:i:jl:m:no:qr:s:t:vC:DE:FG:I:J:KL:M:N:O:R:ST:U:V")) != EOF) { switch (c) { case 'b': - blocksize = strtol(optarg, &tmp, 0); + blocksize = parse_num_blocks2(optarg, -1); b = (blocksize > 0) ? blocksize : -blocksize; if (b < EXT2_MIN_BLOCK_SIZE || - b > EXT2_MAX_BLOCK_SIZE || *tmp) { + b > EXT2_MAX_BLOCK_SIZE) { com_err(program_name, 0, _("invalid block size - %s"), optarg); exit(1); @@ -1345,9 +1345,9 @@ profile_error: cflag++; break; case 'C': - cluster_size = strtoul(optarg, &tmp, 0); + cluster_size = parse_num_blocks2(optarg, -1); if (cluster_size <= EXT2_MIN_CLUSTER_SIZE || - cluster_size > EXT2_MAX_CLUSTER_SIZE || *tmp) { + cluster_size > EXT2_MAX_CLUSTER_SIZE) { com_err(program_name, 0, _("invalid cluster size - %s"), optarg); -- 1.7.12.rc0.22.gcdd159b