e2fsck: map PROMPT_* values to prompt messages

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

diff --git a/misc/badblocks.c b/misc/badblocks.c
index 0c4019a..afeb3da 100644 (file)
--- a/misc/badblocks.c
+++ b/misc/badblocks.c
@@ -50,6 +50,9 @@ extern int optind;
 #include <setjmp.h>
 #include <time.h>
 #include <limits.h>
+#ifdef HAVE_MBSTOWCS
+#include <wchar.h>
+#endif
 
 #include <sys/time.h>
 #include <sys/ioctl.h>
@@ -94,7 +97,7 @@ static unsigned int sys_page_size = 4096;
 static void usage(void)
 {
        fprintf(stderr, _(
-"Usage: %s [-b block_size] [-i input_file] [-o output_file] [-svwnf]\n"
+"Usage: %s [-b block_size] [-i input_file] [-o output_file] [-svwnfBX]\n"
 "       [-c blocks_at_once] [-d delay_factor_between_reads] [-e max_bad_blocks]\n"
 "       [-p num_passes] [-t test_pattern [-t test_pattern [...]]]\n"
 "       device [last_block [first_block]]\n"),
@@ -127,7 +130,7 @@ static void *allocate_buffer(size_t size)
        void    *ret = 0;
 
 #ifdef HAVE_POSIX_MEMALIGN
-       if (posix_memalign(&ret, sys_page_size, size) < 0)
+       if (posix_memalign(&ret, sys_page_size, size) != 0)
                ret = 0;
 #else
 #ifdef HAVE_MEMALIGN
@@ -216,6 +219,9 @@ static void print_status(void)
 {
        struct timeval time_end;
        char diff_buf[32], line_buf[128];
+#ifdef HAVE_MBSTOWCS
+       wchar_t wline_buf[128];
+#endif
        int len;
 
        gettimeofday(&time_end, 0);
@@ -229,7 +235,10 @@ static void print_status(void)
                       num_write_errors,
                       num_corruption_errors);
 #ifdef HAVE_MBSTOWCS
-       len = mbstowcs(NULL, line_buf, sizeof(line_buf));
+       mbstowcs(wline_buf, line_buf, sizeof(line_buf));
+       len = wcswidth(wline_buf, sizeof(line_buf));
+       if (len < 0)
+               len = strlen(line_buf); /* Should never happen... */
 #endif
        fputs(line_buf, stderr);
        memset(line_buf, '\b', len);
@@ -883,7 +892,6 @@ static unsigned int test_nd (int dev, blk_t last_block,
                        test_ptr += got * block_size;
                        currently_testing += got;
                        if (got != try) {
-                               try = 1;
                                if (recover_block == ~0U)
                                        recover_block = currently_testing -
                                                got + blocks_at_once;
@@ -1057,7 +1065,7 @@ int main (int argc, char ** argv)
                                  unsigned int);
        int open_flag;
        long sysval;
-       blk64_t inblk;
+       unsigned long long inblk;
 
        setbuf(stdout, NULL);
        setbuf(stderr, NULL);
@@ -1192,6 +1200,19 @@ int main (int argc, char ** argv)
                        exit(1);
                }
        }
+       if ((block_size <= 0) || (block_size > (1 << 24)) ||
+           (block_size & (block_size - 1))) {
+               com_err(program_name, 0, _("Invalid block size: %d\n"),
+                       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"),
+                       blocks_at_once);
+               exit(1);
+       }
+
        if (optind > argc - 1)
                usage();
        device_name = argv[optind++];
@@ -1222,14 +1243,15 @@ int main (int argc, char ** argv)
        } else first_block = 0;
        if (first_block >= last_block) {
            com_err (program_name, 0, _("invalid starting block (%llu): must be less than %llu"),
-                    first_block, last_block);
+                    (unsigned long long) first_block,
+                    (unsigned long long) last_block);
            exit (1);
        }
        /* ext2 badblocks file can't handle large values */
        if (last_block >> 32) {
                com_err(program_name, EOVERFLOW,
                        _("invalid end block (%llu): must be 32-bit value"),
-                       last_block);
+                       (unsigned long long) last_block);
                exit(1);
        }
        if (w_flag)