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>
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)