korg/e2fsprogs
0
0
Fork 0
mirror of https://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git synced 2024-11-27 03:54:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

badblocks: separate and improve error messages for blocks_at_once

Browse Source 
Since the conditional checks the product of block_size and
blocks_at_once, reporting that the problem is solely with
blocks_at_once is misleading.

Also change the error to use the name of the parameter listed in the
manual rather than the variable name.

Since blocks_at_once is unsigned, change the test to == rather than <=.

Before:
$ misc/badblocks -w -b 16777216 -c 524288 -e 1 -s -v /tmp/testfile.bin
misc/badblocks: Invalid blocks_at_once: 524288

After:
$ misc/badblocks -w -b 16777216 -c 524288 -e 1 -s -v /tmp/testfile.bin
misc/badblocks: For block size 16777216, blocks_at_once too large: 524288

$ misc/badblocks -w -b 16777216 -c 0 -e 1 -s -v /tmp/testfile.bin
misc/badblocks: Invalid number of blocks: 0

Signed-off-by: Corey Hickey <bugfood-c@fatooh.org>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
This commit is contained in:
Corey Hickey 2022-01-23 18:33:22 -08:00 committed by Theodore Ts'o
parent 513e559bfc
commit 8c48a46ebd
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
misc/badblocks.c
View File

@ -1211,11 +1211,14 @@ int main (int argc, char ** argv)
block_size);
exit(1);
}
if ((blocks_at_once <= 0) ||
(((unsigned long long) block_size * blocks_at_once) > 0xFFFFFFFF)) {
com_err(program_name, 0, _("Invalid blocks_at_once: %d\n"),
if (blocks_at_once == 0) {
com_err(program_name, 0, _("Invalid number of blocks: %d\n"),
blocks_at_once);
exit(1);
} else if (((unsigned long long) block_size * blocks_at_once) > 0xFFFFFFFF) {
com_err(program_name, 0, _("For block size %d, number of blocks too large: %d\n"),
block_size, blocks_at_once);
exit(1);
}
if (optind > argc - 1)