#include <fcntl.h>
#ifdef HAVE_GETOPT_H
#include <getopt.h>
+#else
+extern char *optarg;
+extern int optind;
#endif
#include <signal.h>
#include <stdio.h>
#include <sys/ioctl.h>
#include <sys/types.h>
-#if HAVE_LINUX_FS_H
-#include <linux/fd.h>
-#endif
-
#include "et/com_err.h"
#include "ext2fs/ext2_io.h"
-#include <linux/ext2_fs.h>
+#include "ext2fs/ext2_fs.h"
#include "ext2fs/ext2fs.h"
+#include "nls-enable.h"
const char * program_name = "badblocks";
-const char * done_string = "done \n";
+const char * done_string = N_("done \n");
-int v_flag = 0; /* verbose */
-int w_flag = 0; /* do r/w test: 0=no, 1=yes, 2=non-destructive */
-int s_flag = 0; /* show progress of test */
+static int v_flag = 0; /* verbose */
+static int w_flag = 0; /* do r/w test: 0=no, 1=yes,
+ * 2=non-destructive */
+static int s_flag = 0; /* show progress of test */
+static int force = 0; /* force check of mounted device */
static void usage(void)
{
- fprintf (stderr, "Usage: %s [-b block_size] [-i input_file] [-o output_file] [-svwn]\n [-c blocks_at_once] [-p num_passes] device blocks_count [start_count]\n",
+ fprintf(stderr, _("Usage: %s [-b block_size] [-i input_file] [-o output_file] [-svwnf]\n [-c blocks_at_once] [-p num_passes] device [last_block [start_count]]\n"),
program_name);
exit (1);
}
return 1;
}
-static void print_status (void)
+static void print_status(void)
{
fprintf(stderr, "%9ld/%9ld", currently_testing, num_blocks);
fprintf(stderr, "\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b");
fflush (stderr);
}
-static void alarm_intr (int alnum)
+static void alarm_intr(int alnum)
{
signal (SIGALRM, alarm_intr);
alarm(1);
static void *terminate_addr = NULL;
-static void terminate_intr (int signo)
+static void terminate_intr(int signo)
{
if (terminate_addr)
longjmp(terminate_addr,1);
exit(1);
}
-static void capture_terminate (jmp_buf term_addr)
+static void capture_terminate(jmp_buf term_addr)
{
terminate_addr = term_addr;
signal (SIGHUP, terminate_intr);
signal (SIGUSR2, terminate_intr);
}
+static void uncapture_terminate(void)
+{
+ terminate_addr = NULL;
+ signal (SIGHUP, SIG_DFL);
+ signal (SIGINT, SIG_DFL);
+ signal (SIGPIPE, SIG_DFL);
+ signal (SIGTERM, SIG_DFL);
+ signal (SIGUSR1, SIG_DFL);
+ signal (SIGUSR2, SIG_DFL);
+}
+
/*
* Perform a read of a sequence of blocks; return the number of blocks
* successfully sequentially read.
/* Seek to the correct loc. */
if (ext2fs_llseek (dev, (ext2_loff_t) current_block * block_size,
SEEK_SET) != (ext2_loff_t) current_block * block_size)
- com_err (program_name, errno, "during seek");
+ com_err (program_name, errno, _("during seek"));
/* Try the read */
got = read (dev, buffer, try * block_size);
if (got < 0)
got = 0;
if (got & 511)
- fprintf (stderr,
- "Weird value (%ld) in do_read\n", got);
+ fprintf(stderr, _("Weird value (%ld) in do_read\n"), got);
got /= block_size;
return got;
}
/* Seek to the correct loc. */
if (ext2fs_llseek (dev, (ext2_loff_t) current_block * block_size,
SEEK_SET) != (ext2_loff_t) current_block * block_size)
- com_err (program_name, errno, "during seek");
+ com_err (program_name, errno, _("during seek"));
/* Try the write */
got = write (dev, buffer, try * block_size);
static int host_dev;
-static void flush_bufs (int dev, int sync)
+static void flush_bufs(void)
{
- if (v_flag
-#if !defined (BLKFLSBUF) && !defined (FDFLUSH)
- && sync
-#endif
- )
- fprintf (stderr, "Flushing buffers\n");
-
- if (sync && fdatasync (dev) == -1)
- com_err (program_name, errno, "during fsync");
+ errcode_t retval;
-#ifdef BLKFLSBUF
- ioctl (host_dev, BLKFLSBUF, 0); /* In case this is a HD */
-#endif
-#ifdef FDFLUSH
- ioctl (host_dev, FDFLUSH, 0); /* In case this is floppy */
-#endif
+ retval = ext2fs_sync_device(host_dev, 1);
+ if (retval)
+ com_err(program_name, retval, _("during ext2fs_sync_device"));
}
-static unsigned int test_ro (int dev, unsigned long blocks_count,
+static unsigned int test_ro (int dev, unsigned long last_block,
int block_size, unsigned long from_count,
unsigned long blocks_at_once)
{
errcode = ext2fs_badblocks_list_iterate_begin(bb_list,&bb_iter);
if (errcode) {
- com_err (program_name, errcode, "while beginning bad block list iteration");
+ com_err (program_name, errcode,
+ _("while beginning bad block list iteration"));
exit (1);
}
do {
blkbuf = malloc (blocks_at_once * block_size);
if (!blkbuf)
{
- com_err (program_name, ENOMEM, "while allocating buffers");
+ com_err (program_name, ENOMEM, _("while allocating buffers"));
exit (1);
}
- flush_bufs (dev, 0);
+ flush_bufs();
if (v_flag) {
- fprintf (stderr,
- "Checking for bad blocks in read-only mode\n");
- fprintf (stderr, "From block %lu to %lu\n", from_count, blocks_count);
+ fprintf(stderr, _("Checking for bad blocks in read-only mode\n"));
+ fprintf (stderr, _("From block %lu to %lu\n"), from_count,
+ last_block);
}
try = blocks_at_once;
currently_testing = from_count;
- num_blocks = blocks_count;
+ num_blocks = last_block;
if (s_flag || v_flag > 1) {
- fprintf(stderr, "Checking for bad blocks (read-only test): ");
+ fprintf(stderr,
+ _("Checking for bad blocks (read-only test): "));
if (v_flag <= 1)
alarm_intr(SIGALRM);
}
- while (currently_testing < blocks_count)
+ while (currently_testing < last_block)
{
if (next_bad) {
if (currently_testing == next_bad) {
else if (currently_testing + try > next_bad)
try = next_bad - currently_testing;
}
- if (currently_testing + try > blocks_count)
- try = blocks_count - currently_testing;
+ if (currently_testing + try > last_block)
+ try = last_block - currently_testing;
got = do_read (dev, blkbuf, try, block_size, currently_testing);
currently_testing += got;
if (got == try) {
num_blocks = 0;
alarm(0);
if (s_flag || v_flag > 1)
- fprintf(stderr, done_string);
+ fprintf(stderr, _(done_string));
fflush (stderr);
free (blkbuf);
return bb_count;
}
-static unsigned int test_rw (int dev, unsigned long blocks_count,
+static unsigned int test_rw (int dev, unsigned long last_block,
int block_size, unsigned long from_count,
unsigned long blocks_at_once)
{
int i;
char * buffer;
- unsigned char pattern[] = {0xaa, 0x55, 0xff, 0x00};
+ static unsigned char pattern[] = {0xaa, 0x55, 0xff, 0x00};
unsigned int bb_count = 0;
buffer = malloc (2 * block_size);
if (!buffer)
{
- com_err (program_name, ENOMEM, "while allocating buffers");
+ com_err (program_name, ENOMEM, _("while allocating buffers"));
exit (1);
}
- flush_bufs (dev, 0);
+ flush_bufs();
if (v_flag) {
fprintf(stderr,
- "Checking for bad blocks in read-write mode\n");
- fprintf(stderr, "From block %lu to %lu\n",
- from_count, blocks_count);
+ _("Checking for bad blocks in read-write mode\n"));
+ fprintf(stderr, _("From block %lu to %lu\n"),
+ from_count, last_block);
}
for (i = 0; i < sizeof (pattern); i++) {
memset (buffer, pattern[i], block_size);
if (s_flag | v_flag)
- fprintf (stderr, "Writing pattern 0x%08x: ",
+ fprintf (stderr, _("Writing pattern 0x%08x: "),
*((int *) buffer));
- num_blocks = blocks_count;
+ num_blocks = last_block;
currently_testing = from_count;
if (s_flag && v_flag <= 1)
alarm_intr(SIGALRM);
for (;
- currently_testing < blocks_count;
+ currently_testing < last_block;
currently_testing++)
{
if (ext2fs_llseek (dev, (ext2_loff_t) currently_testing *
block_size, SEEK_SET) !=
(ext2_loff_t) currently_testing * block_size)
com_err (program_name, errno,
- "during seek on block %d",
+ _("during seek on block %d"),
currently_testing);
if (v_flag > 1)
print_status();
num_blocks = 0;
alarm (0);
if (s_flag | v_flag)
- fprintf(stderr, done_string);
- flush_bufs (dev, 1);
+ fprintf(stderr, _(done_string));
+ flush_bufs();
if (s_flag | v_flag)
- fprintf (stderr, "Reading and comparing: ");
- num_blocks = blocks_count;
+ fprintf (stderr, _("Reading and comparing: "));
+ num_blocks = last_block;
currently_testing = from_count;
if (s_flag && v_flag <= 1)
alarm_intr(SIGALRM);
for (;
- currently_testing < blocks_count;
+ currently_testing < last_block;
currently_testing++)
{
if (ext2fs_llseek (dev, (ext2_loff_t) currently_testing *
block_size, SEEK_SET) !=
(ext2_loff_t) currently_testing * block_size)
com_err (program_name, errno,
- "during seek on block %d",
+ _("during seek on block %d"),
currently_testing);
if (v_flag > 1)
print_status();
if ((read (dev, buffer + block_size, block_size)
- < block_size) ||
+ != block_size) ||
memcmp(buffer, buffer + block_size, block_size))
- bb_count = bb_output(currently_testing);
+ bb_count += bb_output(currently_testing);
}
num_blocks = 0;
alarm (0);
if (s_flag | v_flag)
- fprintf(stderr, done_string);
- flush_bufs (dev, 0);
+ fprintf(stderr, _(done_string));
+ flush_bufs();
}
return bb_count;
}
-static unsigned int test_nd (int dev, unsigned long blocks_count,
+struct saved_blk_record {
+ blk_t block;
+ int num;
+};
+
+static unsigned int test_nd (int dev, unsigned long last_block,
int block_size, unsigned long from_count,
unsigned long blocks_at_once)
{
char *blkbuf, *save_ptr, *test_ptr, *read_ptr;
char * ptr;
int try, i;
- long got, used2;
- unsigned long *bufblk;
- unsigned long *bufblks;
+ long got, used2, written, save_currently_testing;
+ struct saved_blk_record *test_record;
+ /* This is static to prevent being clobbered by the longjmp */
+ static int num_saved;
jmp_buf terminate_env;
errcode_t errcode;
- /* These are static to prevent being clobbered by the longjmp */
- static long buf_used;
- static unsigned int bb_count;
-
- bb_count = 0;
- buf_used = 0;
+ long buf_used;
+ unsigned int bb_count;
errcode = ext2fs_badblocks_list_iterate_begin(bb_list,&bb_iter);
if (errcode) {
com_err (program_name, errcode,
- "while beginning bad block list iteration");
+ _("while beginning bad block list iteration"));
exit (1);
}
do {
} while (next_bad && next_bad < from_count);
blkbuf = malloc (3 * blocks_at_once * block_size);
- bufblk = malloc (blocks_at_once * sizeof(unsigned long));
- bufblks = malloc (blocks_at_once * sizeof(unsigned long));
- if (!blkbuf || !bufblk || !bufblks) {
- com_err (program_name, ENOMEM, "while allocating buffers");
+ test_record = malloc (blocks_at_once*sizeof(struct saved_blk_record));
+ if (!blkbuf || !test_record) {
+ com_err(program_name, ENOMEM, _("while allocating buffers"));
exit (1);
}
+ num_saved = 0;
/* inititalize the test data randomly: */
if (v_flag) {
- fprintf (stderr, "Initializing random test data\n");
+ fprintf (stderr, _("Initializing random test data\n"));
}
for(ptr = blkbuf + blocks_at_once * block_size;
ptr < blkbuf + 2 * blocks_at_once * block_size;
(*ptr) = random() % (1 << sizeof(char));
}
- flush_bufs (dev, 0);
+ flush_bufs();
if (v_flag) {
fprintf (stderr,
- "Checking for bad blocks in non-destructive read-write mode\n");
- fprintf (stderr, "From block %lu to %lu\n", from_count, blocks_count);
+ _("Checking for bad blocks in non-destructive read-write mode\n"));
+ fprintf (stderr, _("From block %lu to %lu\n"), from_count, last_block);
}
if (s_flag || v_flag > 1) {
- fprintf (stderr, "Checking for bad blocks (non-destructive read-write test): ");
+ fprintf(stderr, _("Checking for bad blocks (non-destructive read-write test): "));
if (v_flag <= 1)
alarm_intr(SIGALRM);
}
- if (! setjmp(terminate_env)) {
- /* set up abend handler */
- capture_terminate(terminate_env);
+ if (setjmp(terminate_env)) {
+ /*
+ * Abnormal termination by a signal is handled here.
+ */
+ signal (SIGALRM, SIG_IGN);
+ fprintf(stderr, _("\nInterrupt caught, cleaning up\n"));
+
+ save_ptr = blkbuf;
+ for (i=0; i < num_saved; i++) {
+ do_write(dev, save_ptr, test_record[i].num,
+ block_size, test_record[i].block);
+ save_ptr += test_record[i].num * block_size;
+ }
+ fflush (out);
+ exit(1);
+ }
+
+ /* set up abend handler */
+ capture_terminate(terminate_env);
+
+ buf_used = 0;
+ bb_count = 0;
+ save_ptr = blkbuf;
+ test_ptr = blkbuf + (blocks_at_once * block_size);
+ currently_testing = from_count;
+ num_blocks = last_block;
+
+ while (currently_testing < last_block) {
+ try = blocks_at_once - buf_used;
+ if (next_bad) {
+ if (currently_testing == next_bad) {
+ /* fprintf (out, "%lu\n", nextbad); */
+ ext2fs_badblocks_list_iterate (bb_iter, &next_bad);
+ currently_testing++;
+ goto check_for_more;
+ }
+ else if (currently_testing + try > next_bad)
+ try = next_bad - currently_testing;
+ }
+ if (currently_testing + try > last_block)
+ try = last_block - currently_testing;
+ got = do_read (dev, save_ptr, try, block_size,
+ currently_testing);
+ if (got == 0) {
+ /* First block must have been bad. */
+ bb_count += bb_output(currently_testing++);
+ goto check_for_more;
+ }
+
+ /*
+ * Note the fact that we've saved this much data
+ * *before* we overwrite it with test data
+ */
+ test_record[num_saved].block = currently_testing;
+ test_record[num_saved].num = got;
+ num_saved++;
+
+ /* Write the test data */
+ written = do_write (dev, test_ptr, got, block_size,
+ currently_testing);
+ if (written != got)
+ com_err (program_name, errno,
+ _("during test data write, block %lu"),
+ currently_testing + written);
+
+ buf_used += got;
+ save_ptr += got * block_size;
+ test_ptr += got * block_size;
+ currently_testing += got;
+ if (got != try)
+ bb_count += bb_output(currently_testing++);
+
+ check_for_more:
+ /*
+ * If there's room for more blocks to be tested this
+ * around, and we're not done yet testing the disk, go
+ * back and get some more blocks.
+ */
+ if ((buf_used != blocks_at_once) &&
+ (currently_testing < last_block))
+ continue;
- buf_used = 0; save_ptr = blkbuf;
+ flush_bufs();
+ save_currently_testing = currently_testing;
+
+ /*
+ * for each contiguous block that we read into the
+ * buffer (and wrote test data into afterwards), read
+ * it back (looping if necessary, to get past newly
+ * discovered unreadable blocks, of which there should
+ * be none, but with a hard drive which is unreliable,
+ * it has happened), and compare with the test data
+ * that was written; output to the bad block list if
+ * it doesn't match.
+ */
+ used2 = 0;
+ save_ptr = blkbuf;
test_ptr = blkbuf + (blocks_at_once * block_size);
- currently_testing = from_count;
- num_blocks = blocks_count;
-
- while (currently_testing < blocks_count) {
- try = blocks_at_once - buf_used;
- if (next_bad) {
- if (currently_testing == next_bad) {
- /* fprintf (out, "%lu\n", nextbad); */
- ext2fs_badblocks_list_iterate (bb_iter, &next_bad);
- bufblk[buf_used] = currently_testing++;
- goto test_full_buf;
- }
- else if (currently_testing + try > next_bad)
- try = next_bad - currently_testing;
+ read_ptr = blkbuf + (2 * blocks_at_once * block_size);
+ try = 0;
+
+ while (1) {
+ if (try == 0) {
+ if (used2 >= num_saved)
+ break;
+ currently_testing = test_record[used2].block;
+ try = test_record[used2].num;
+ used2++;
}
- if (currently_testing + try > blocks_count)
- try = blocks_count - currently_testing;
- got = do_read (dev, save_ptr, try, block_size,
- currently_testing);
-
- /* if reading succeeded, write the test data */
- if (got) {
- long written;
-
- written = do_write (dev, test_ptr, got,
- block_size,
- currently_testing);
- if (written != got)
- com_err (program_name, errno,
- "during test data write, block %lu",
- currently_testing + written);
+
+ got = do_read (dev, read_ptr, try,
+ block_size, currently_testing);
+
+ /* test the comparison between all the
+ blocks successfully read */
+ for (i = 0; i < got; ++i)
+ if (memcmp (test_ptr+i*block_size,
+ read_ptr+i*block_size, block_size))
+ bb_count += bb_output(currently_testing + i);
+ if (got < try) {
+ bb_count += bb_output(currently_testing + got);
+ got++;
}
+
+ /* when done, write back original data */
+ do_write (dev, save_ptr, got, block_size,
+ currently_testing);
- bufblk[buf_used] = currently_testing;
- bufblks[buf_used] = got;
- buf_used += got;
+ currently_testing += got;
save_ptr += got * block_size;
test_ptr += got * block_size;
- currently_testing += got;
- if (got != try)
- bb_count += bb_output(currently_testing++);
-
- test_full_buf:
- /*
- * If there's room for more blocks to be
- * tested this around, and we're not done yet
- * testing the disk, go back and get some
- * more blocks.
- */
- if ((buf_used != blocks_at_once) &&
- (currently_testing != blocks_count))
- continue;
-
- flush_bufs (dev, 1);
-
- /*
- * for each contiguous block that we read into
- * the buffer (and wrote test data into
- * afterwards), read it back (looping if
- * necessary, to get past newly discovered
- * unreadable blocks, of which there should be
- * none, but with a hard drive which is
- * unreliable, it has happened), and compare
- * with the test data that was written; output
- * to the bad block list if it doesn't match.
- */
- used2 = 0;
- save_ptr = blkbuf;
- test_ptr = blkbuf + (blocks_at_once * block_size);
- read_ptr = blkbuf + (2 * blocks_at_once * block_size);
- currently_testing = bufblk[0];
- try = bufblks[0];
- while (currently_testing < blocks_count) {
-
- got = do_read (dev, read_ptr, try,
- block_size, currently_testing);
-
- /* test the comparison between all the
- blocks successfully read */
- for (i = 0; i < got; ++i)
- if (memcmp (test_ptr, read_ptr,
- block_size))
- bb_count += bb_output(currently_testing + i);
- if (got == 0) {
- bb_count += bb_output(currently_testing);
- got = 1;
- }
-
- /* when done, write back original data */
- do_write (dev, save_ptr, got, block_size,
- currently_testing);
-
- currently_testing += got;
- save_ptr += bufblks[got] * block_size;
- test_ptr += bufblks[got] * block_size;
- read_ptr += bufblks[got] * block_size;
- try -= got;
-
- if (try == 0) {
- used2 += bufblks[used2];
- if (used2 >= blocks_at_once)
- break;
- currently_testing = bufblk[used2];
- try = bufblks[used2];
- }
- }
-
- /* empty the buffer so it can be reused */
- buf_used = 0;
+ read_ptr += got * block_size;
+ try -= got;
}
- num_blocks = 0;
- alarm(0);
- if (s_flag || v_flag > 1)
- fprintf(stderr, "done \n");
-
- } else {
- /* abnormal termination by a signal is handled here */
- /* logic is: write back the data that is in the buffer,
- so that we can maintain data integrity on disk. Then
- abort. */
- long buf_written;
- fprintf(stderr, "Interrupt caught, cleaning up\n");
-
- for (buf_written = 0;
- buf_written < buf_used;
- buf_written += bufblks[buf_written])
- do_write (dev, blkbuf + buf_written * block_size,
- bufblks[buf_written], block_size,
- bufblk[buf_written]);
-
- fflush (out);
- exit(1);
+ /* empty the buffer so it can be reused */
+ num_saved = 0;
+ buf_used = 0;
+ save_ptr = blkbuf;
+ test_ptr = blkbuf + (blocks_at_once * block_size);
+ currently_testing = save_currently_testing;
}
+ num_blocks = 0;
+ alarm(0);
+ uncapture_terminate();
+ if (s_flag || v_flag > 1)
+ fprintf(stderr, _(done_string));
fflush(stderr);
free(blkbuf);
- free(bufblk);
- free(bufblks);
+ free(test_record);
ext2fs_badblocks_list_iterate_end(bb_iter);
return bb_count;
}
+static void check_mount(char *device_name)
+{
+ errcode_t retval;
+ int mount_flags;
+
+ retval = ext2fs_check_if_mounted(device_name, &mount_flags);
+ if (retval) {
+ com_err("ext2fs_check_if_mount", retval,
+ _("while determining whether %s is mounted."),
+ device_name);
+ return;
+ }
+ if (!(mount_flags & EXT2_MF_MOUNTED))
+ return;
+
+ fprintf(stderr, _("%s is mounted; "), device_name);
+ if (force) {
+ fprintf(stderr, _("badblocks forced anyway. "
+ "Hope /etc/mtab is incorrect.\n"));
+ return;
+ }
+ fprintf(stderr, _("it's not safe to run badblocks!\n"));
+ exit(1);
+}
+
+
int main (int argc, char ** argv)
{
int c;
FILE * in = NULL;
int block_size = 1024;
unsigned long blocks_at_once = 16;
- unsigned long blocks_count, from_count;
+ blk_t last_block, from_count;
int num_passes = 0;
int passes_clean = 0;
int dev;
errcode_t errcode;
+ unsigned int (*test_func)(int, unsigned long,
+ int, unsigned long,
+ unsigned long);
setbuf(stdout, NULL);
setbuf(stderr, NULL);
+#ifdef ENABLE_NLS
+ setlocale(LC_MESSAGES, "");
+ bindtextdomain(NLS_CAT_NAME, LOCALEDIR);
+ textdomain(NLS_CAT_NAME);
+#endif
+ test_func = test_ro;
+
if (argc && *argv)
program_name = *argv;
- while ((c = getopt (argc, argv, "b:i:o:svwnc:p:h:")) != EOF) {
+ while ((c = getopt (argc, argv, "b:fi:o:svwnc:p:h:")) != EOF) {
switch (c) {
case 'b':
block_size = strtoul (optarg, &tmp, 0);
if (*tmp || block_size > 4096) {
com_err (program_name, 0,
- "bad block size - %s", optarg);
+ _("bad block size - %s"), optarg);
exit (1);
}
break;
+ case 'f':
+ force++;
+ break;
case 'i':
input_file = optarg;
break;
v_flag++;
break;
case 'w':
- if (! w_flag)
- w_flag = 1;
+ if (w_flag)
+ usage();
+ test_func = test_rw;
+ w_flag = 1;
break;
case 'n':
+ if (w_flag)
+ usage();
+ test_func = test_nd;
w_flag = 2;
break;
case 'c':
if (optind > argc - 1)
usage();
device_name = argv[optind++];
- if (optind > argc - 1)
- usage();
- blocks_count = strtoul (argv[optind], &tmp, 0);
- if (*tmp)
- {
- com_err (program_name, 0, "bad blocks count - %s", argv[optind]);
- exit (1);
+ if (optind > argc - 1) {
+ errcode = ext2fs_get_device_size(device_name,
+ block_size,
+ &last_block);
+ if (errcode == EXT2_ET_UNIMPLEMENTED) {
+ com_err(program_name, 0,
+ _("Couldn't determine device size; you "
+ "must specify\nthe size manually\n"));
+ exit(1);
+ }
+ if (errcode) {
+ com_err(program_name, errcode,
+ _("while trying to determine device size"));
+ exit(1);
+ }
+ } else {
+ last_block = strtoul (argv[optind], &tmp, 0);
+ if (*tmp) {
+ com_err (program_name, 0, _("bad blocks count - %s"),
+ argv[optind]);
+ exit (1);
+ }
+ optind++;
}
- if (++optind <= argc-1) {
+ if (optind <= argc-1) {
from_count = strtoul (argv[optind], &tmp, 0);
+ if (*tmp) {
+ com_err (program_name, 0, _("bad starting block - %s"),
+ argv[optind]);
+ exit (1);
+ }
} else from_count = 0;
- if (from_count >= blocks_count) {
- com_err (program_name, 0, "bad blocks range: %lu-%lu",
- from_count, blocks_count);
+ if (from_count >= last_block) {
+ com_err (program_name, 0, _("bad blocks range: %lu-%lu"),
+ from_count, last_block);
exit (1);
}
+ if (w_flag)
+ check_mount(device_name);
+
dev = open (device_name, w_flag ? O_RDWR : O_RDONLY);
if (dev == -1)
{
- com_err (program_name, errno, "while trying to open %s",
+ com_err (program_name, errno, _("while trying to open %s"),
device_name);
exit (1);
}
host_dev = open (host_device_name, O_RDONLY);
if (host_dev == -1)
{
- com_err (program_name, errno, "while trying to open %s",
- host_device_name);
+ com_err (program_name, errno,
+ _("while trying to open %s"),
+ host_device_name);
exit (1);
}
} else
in = fopen (input_file, "r");
if (in == NULL)
{
- com_err (program_name, errno,"while trying to open %s",
+ com_err (program_name, errno,
+ _("while trying to open %s"),
input_file);
exit (1);
}
out = fopen (output_file, "w");
if (out == NULL)
{
- com_err (program_name, errno,"while trying to open %s",
+ com_err (program_name, errno,
+ _("while trying to open %s"),
output_file);
exit (1);
}
errcode = ext2fs_badblocks_list_create(&bb_list,0);
if (errcode) {
- com_err (program_name, errcode, "creating in-memory bad blocks list");
+ com_err (program_name, errcode,
+ _("creating in-memory bad blocks list"));
exit (1);
}
if (in) {
for(;;) {
- switch(fscanf (in, "%lu\n", &next_bad)) {
+ switch(fscanf (in, "%u\n", &next_bad)) {
case 0:
com_err (program_name, 0, "input file - bad format");
exit (1);
default:
errcode = ext2fs_badblocks_list_add(bb_list,next_bad);
if (errcode) {
- com_err (program_name, errcode, "adding to in-memory bad block list");
+ com_err (program_name, errcode, _("adding to in-memory bad block list"));
exit (1);
}
continue;
do {
unsigned int bb_count;
- (bb_count =
-
- (w_flag == 2 ? test_nd
- : w_flag ? test_rw
- : test_ro)
- (dev, blocks_count, block_size, from_count,
- blocks_at_once)
- ) ? passes_clean = 0 : ++passes_clean;
-
+ bb_count = test_func(dev, last_block, block_size,
+ from_count, blocks_at_once);
+ if (bb_count)
+ passes_clean = 0;
+ else
+ ++passes_clean;
+
if (v_flag)
- fprintf(stderr,"Pass completed, %u bad blocks found.\n", bb_count);
+ fprintf(stderr,
+ _("Pass completed, %u bad blocks found.\n"),
+ bb_count);
} while (passes_clean < num_passes);
fclose (out);
return 0;
}
+
git://git.whamcloud.com / tools / e2fsprogs.git / blobdiff