badblocks: separate and improve error messages for blocks_at_once

[thirdparty/e2fsprogs.git] / misc / badblocks.c

diff --git a/misc/badblocks.c b/misc/badblocks.c
index e640eadd432962c95d535158a52af6d74cc1f706..0e74be801370589db65627aa13742b6e2c3b805d 100644 (file)
--- a/misc/badblocks.c
+++ b/misc/badblocks.c
@@ -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)