From 86a985e74987b08090ecbacf3d02c8d80594c809 Mon Sep 17 00:00:00 2001 From: Theodore Ts'o Date: Mon, 14 Jan 2013 19:03:11 -0500 Subject: [PATCH] mke2fs: teach mke2fs to understand -b 4k and -C 256M The -b and -C options now use parse_num_blocks2() instead of strtol, so that users can specify -C 256M instead of the much less convenient -C 268435456. Signed-off-by: "Theodore Ts'o" Reviewed-by: Zheng Liu --- misc/mke2fs.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/misc/mke2fs.c b/misc/mke2fs.c index 2103f63..ace9eae 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.8.3.1