Add new function in e2p for parsing the number of blocks on the command line
for mke2fs and resize2fs, and use this function so that filesystem size
inputs to e2fsprogs command line programs are parsed consistently.
diff --git a/misc/ChangeLog b/misc/ChangeLog
index e040632..7b288e7 100644
--- a/misc/ChangeLog
+++ b/misc/ChangeLog
@@ -1,3 +1,9 @@
+2005-01-05 Theodore Ts'o <tytso@mit.edu>
+
+ * mke2fs.c (PRS, parse_r_opts): Use parse_num_blocks() from the
+ e2p library to parse the number of blocks from the command
+ line.
+
2004-12-23 Theodore Ts'o <tytso@mit.edu>
* dumpe2fs.c (list_desc): If reserved GDT blocks are present,
diff --git a/misc/mke2fs.c b/misc/mke2fs.c
index 8bf5c18..2365fbb 100644
--- a/misc/mke2fs.c
+++ b/misc/mke2fs.c
@@ -1,7 +1,8 @@
/*
* mke2fs.c - Make a ext2fs filesystem.
*
- * Copyright (C) 1994, 1995, 1996, 1997 Theodore Ts'o.
+ * Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+ * 2003, 2004, 2005 by Theodore Ts'o.
*
* %Begin-Header%
* This file may be redistributed under the terms of the GNU Public
@@ -820,36 +821,13 @@
continue;
}
- p = &arg[strlen(arg) - 1];
-
- switch(*p++) {
- case 'T':
- case 't': resize <<= 10; /* no break */
- case 'G':
- case 'g': resize <<= 10; /* no break */
- case 'M':
- case 'm': resize <<= 10; /* no break */
- case 'K':
- case 'k': resize >>= param->s_log_block_size -10; *p = 0; break;
- case 'b': resize >>= param->s_log_block_size - 9; *p = 0; break;
- case '0': break;
- case '1': break;
- case '2': break;
- case '3': break;
- case '4': break;
- case '5': break;
- case '6': break;
- case '7': break;
- case '8': break;
- case '9': break;
- default: r_usage++; continue;
- }
-
- resize *= strtoul(arg, NULL, 0);
+ resize = parse_num_blocks(arg,
+ param->s_log_block_size);
if (resize == 0) {
- fprintf(stderr,
- _("Invalid resize parameter.\n"));
+ fprintf(stderr,
+ _("Invalid resize parameter: %s\n"),
+ arg);
r_usage++;
continue;
}
@@ -978,7 +956,7 @@
}
while ((c = getopt (argc, argv,
- "b:cf:g:i:jl:m:no:qr:R:s:tvI:J:ST:FL:M:N:O:V")) != EOF)
+ "b:cf:g:i:jl:m:no:qr:R:s:tvI:J:ST:FL:M:N:O:V")) != EOF) {
switch (c) {
case 'b':
blocksize = strtol(optarg, &tmp, 0);
@@ -1149,22 +1127,10 @@
default:
usage();
}
+ }
if ((optind == argc) && !show_version_only)
usage();
- device_name = argv[optind];
- optind++;
- if (optind < argc) {
- unsigned long long tmp2 = strtoull(argv[optind++], &tmp, 0);
-
- if ((*tmp) || (tmp2 > 0xfffffffful)) {
- com_err(program_name, 0, _("bad blocks count - %s"),
- argv[optind - 1]);
- exit(1);
- }
- param.s_blocks_count = tmp2;
- }
- if (optind < argc)
- usage();
+ device_name = argv[optind++];
if (!quiet || show_version_only)
fprintf (stderr, "mke2fs %s (%s)\n", E2FSPROGS_VERSION,
@@ -1229,6 +1195,18 @@
"blocksizes greater than 4096 \n\tusing ext3."
" Use -b 4096 if this is an issue for you.\n\n");
+ if (optind < argc) {
+ param.s_blocks_count = parse_num_blocks(argv[optind++],
+ param.s_log_block_size);
+ if (!param.s_blocks_count) {
+ com_err(program_name, 0, _("bad blocks count - %s"),
+ argv[optind - 1]);
+ exit(1);
+ }
+ }
+ if (optind < argc)
+ usage();
+
if (param.s_feature_incompat & EXT3_FEATURE_INCOMPAT_JOURNAL_DEV) {
if (!fs_type)
fs_type = "journal";