#include <setjmp.h>
#include <time.h>
#include <limits.h>
+#ifdef HAVE_MBSTOWCS
+#include <wchar.h>
+#endif
#include <sys/time.h>
#include <sys/ioctl.h>
#include "ext2fs/ext2_io.h"
#include "ext2fs/ext2_fs.h"
#include "ext2fs/ext2fs.h"
-#include "nls-enable.h"
+#include "support/nls-enable.h"
#ifndef O_LARGEFILE
#define O_LARGEFILE 0
#endif
+/* Maximum number of bad blocks we support */
+#define MAX_BAD_BLOCKS (INT_MAX/2)
+
static const char * program_name = "badblocks";
static const char * done_string = N_("done \n");
static unsigned int *t_patts; /* test patterns */
static int use_buffered_io;
static int exclusive_ok;
-static unsigned int max_bb; /* Abort test if more than this number of bad blocks has been encountered */
+static unsigned int max_bb = MAX_BAD_BLOCKS; /* Abort test if more than this
+ * number of bad blocks has been
+ * encountered */
static unsigned int d_flag; /* delay factor between reads */
static struct timeval time_start;
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"),
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
{
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);
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);
alarm_intr(SIGALRM);
while (currently_testing < last_block)
{
- if (max_bb && bb_count >= max_bb) {
+ if (bb_count >= max_bb) {
if (s_flag || v_flag) {
fputs(_("Too many bad blocks, aborting test\n"), stderr);
}
try = blocks_at_once;
while (currently_testing < last_block) {
- if (max_bb && bb_count >= max_bb) {
+ if (bb_count >= max_bb) {
if (s_flag || v_flag) {
fputs(_("Too many bad blocks, aborting test\n"), stderr);
}
try = blocks_at_once;
while (currently_testing < last_block) {
- if (max_bb && bb_count >= max_bb) {
+ if (bb_count >= max_bb) {
if (s_flag || v_flag) {
fputs(_("Too many bad blocks, aborting test\n"), stderr);
}
alarm_intr(SIGALRM);
while (currently_testing < last_block) {
- if (max_bb && bb_count >= max_bb) {
+ if (bb_count >= max_bb) {
if (s_flag || v_flag) {
fputs(_("Too many bad blocks, aborting test\n"), stderr);
}
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;
errno = 0;
ret = strtoul(str, &tmp, 0);
- if (*tmp || errno || (ret > UINT_MAX) ||
- (ret == ULONG_MAX && errno == ERANGE)) {
+ if (*tmp || errno) {
com_err (program_name, 0, _("invalid %s - %s"), descr, str);
exit (1);
+ } else if ((ret > UINT_MAX) ||
+ (ret == ULONG_MAX && errno == ERANGE)) {
+ com_err (program_name, 0, _("%s too large - %lu"), descr, ret);
+ exit (1);
}
return ret;
}
char * input_file = NULL;
char * output_file = NULL;
FILE * in = NULL;
- int block_size = 1024;
+ unsigned int block_size = 1024;
unsigned int blocks_at_once = 64;
blk64_t last_block, first_block;
int num_passes = 0;
unsigned int);
int open_flag;
long sysval;
- blk64_t inblk;
+ unsigned long long inblk;
setbuf(stdout, NULL);
setbuf(stderr, NULL);
if (argc && *argv)
program_name = *argv;
+ else
+ usage();
while ((c = getopt (argc, argv, "b:d:e:fi:o:svwnc:p:h:t:BX")) != EOF) {
switch (c) {
case 'b':
break;
case 'e':
max_bb = parse_uint(optarg, "max bad block count");
+ if (max_bb > MAX_BAD_BLOCKS) {
+ com_err (program_name, 0,
+ _("Too big max bad blocks count %u - "
+ "maximum is %u"), max_bb,
+ MAX_BAD_BLOCKS);
+ exit (1);
+ }
+ /* 0 really means unlimited but we cannot do that much... */
+ if (max_bb == 0)
+ max_bb = MAX_BAD_BLOCKS;
break;
case 'd':
d_flag = parse_uint(optarg, "read delay factor");
exit(1);
}
}
+ if ((block_size == 0) || (block_size > (1 << 24)) ||
+ (block_size & (block_size - 1))) {
+ com_err(program_name, 0, _("Invalid block size: %u\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++];
if (optind > argc - 1) {
errcode = ext2fs_get_device_size2(device_name,
- block_size,
+ (int) block_size,
&last_block);
if (errcode == EXT2_ET_UNIMPLEMENTED) {
com_err(program_name, 0, "%s",
} 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)
do {
unsigned int bb_count;
- bb_count = test_func(dev, last_block, block_size,
+ bb_count = test_func(dev, last_block, (int) block_size,
first_block, blocks_at_once);
if (bb_count)
passes_clean = 0;
projects / thirdparty / e2fsprogs.git / blobdiff