#include <string.h>
#include <fcntl.h>
#include <ctype.h>
-#include <termios.h>
#include <time.h>
+#ifdef HAVE_SIGNAL_H
+#include <signal.h>
+#endif
#ifdef HAVE_GETOPT_H
#include <getopt.h>
+#else
+extern char *optarg;
+extern int optind;
#endif
#include <unistd.h>
#ifdef HAVE_ERRNO_H
#include "problem.h"
#include "../version.h"
-extern int isatty(int);
-
/* Command line options */
static int blocksize = 0;
static int swapfs = 0;
static void usage(e2fsck_t ctx)
{
fprintf(stderr,
- "Usage: %s [-panyrcdfvstFSV] [-b superblock] [-B blocksize]\n"
+ _("Usage: %s [-panyrcdfvstFSV] [-b superblock] [-B blocksize]\n"
"\t\t[-I inode_buffer_blocks] [-P process_inode_size]\n"
- "\t\t[-l|-L bad_blocks_file] device\n", ctx->program_name);
+ "\t\t[-l|-L bad_blocks_file] [-C fd] device\n"),
+ ctx->program_name);
+
+ fprintf(stderr, _("\nEmergency help:\n"
+ " -p Automatic repair (no questions)\n"
+ " -n Make no changes to the filesystem\n"
+ " -y Assume \"yes\" to all questions\n"
+ " -c Check for bad blocks\n"
+ " -f Force checking even if filesystem is marked clean\n"
+ " -v Be verbose\n"
+ " -b superblock Use alternative superblock\n"
+ " -B blocksize Force blocksize when looking for superblock\n"
+ " -l bad_blocks_file Add to badblocks list\n"
+ " -L bad_blocks_file Set badblocks list\n"
+ ));
+
exit(FSCK_USAGE);
}
frag_percent = (frag_percent + 5) / 10;
if (!verbose) {
- printf("%s: %d/%d files (%0d.%d%% non-contiguous), %d/%d blocks\n",
+ printf(_("%s: %d/%d files (%0d.%d%% non-contiguous), %d/%d blocks\n"),
ctx->device_name, inodes_used, inodes,
frag_percent / 10, frag_percent % 10,
blocks_used, blocks);
return;
}
+ /*
+ * This is a bit ugly. But I think there will nearly always be more
+ * than one "thing" to report about, so I won't try writing complex
+ * code to handle one/two/many forms of all words.
+ * Some languages (Italian, at least) never uses the plural form
+ * of foreign words, so in real life this could not be a problem.
+ * md@linux.it - 2000-1-15
+ */
+#ifdef ENABLE_NLS
+ printf (_("\n%8d inodes used (%d%%)\n"), inodes_used,
+ (inodes_used != 1), 100 * inodes_used / inodes);
+ printf (_("%8d non-contiguous inodes (%0d.%d%%)\n"),
+ ctx->fs_fragmented, frag_percent / 10, frag_percent % 10);
+ printf (_(" # of inodes with ind/dind/tind blocks: %d/%d/%d\n"),
+ ctx->fs_ind_count, ctx->fs_dind_count, ctx->fs_tind_count);
+ printf (_("%8d blocks used (%d%%)\n"
+ "%8d bad blocks\n"), blocks_used,
+ 100 * blocks_used / blocks, ctx->fs_badblocks_count);
+ printf (_("\n%8d regular files\n"
+ "%8d directories\n"
+ "%8d character device files\n"
+ "%8d block device files\n"
+ "%8d fifos\n"
+ "%8d links\n"
+ "%8d symbolic links (%d fast symbolic links)\n"
+ "%8d sockets\n"
+ "--------\n"
+ "%8d files\n"),
+ ctx->fs_regular_count,
+ ctx->fs_directory_count,
+ ctx->fs_chardev_count,
+ ctx->fs_blockdev_count,
+ ctx->fs_fifo_count,
+ ctx->fs_links_count - dir_links,
+ ctx->fs_symlinks_count,
+ ctx->fs_fast_symlinks_count,
+ ctx->fs_sockets_count,
+ ctx->fs_total_count - dir_links);
+#else
printf ("\n%8d inode%s used (%d%%)\n", inodes_used,
(inodes_used != 1) ? "s" : "",
100 * inodes_used / inodes);
ctx->fs_sockets_count, (ctx->fs_sockets_count != 1) ? "s" : "",
ctx->fs_total_count - dir_links,
((ctx->fs_total_count - dir_links) != 1) ? "s" : "");
+#endif
}
static void check_mount(e2fsck_t ctx)
retval = ext2fs_check_if_mounted(ctx->filesystem_name, &mount_flags);
if (retval) {
com_err("ext2fs_check_if_mount", retval,
- "while determining whether %s is mounted.",
+ _("while determining whether %s is mounted."),
ctx->filesystem_name);
return;
}
#endif
if (ctx->options & E2F_OPT_READONLY) {
- printf("Warning! %s is mounted.\n", ctx->device_name);
+ printf(_("Warning! %s is mounted.\n"), ctx->filesystem_name);
return;
}
- printf("%s is mounted.\n\n", ctx->device_name);
- printf("\007\007\007\007WARNING!!! Running e2fsck on a mounted filesystem "
- "may cause\nSEVERE filesystem damage.\007\007\007\n\n");
- if (isatty (0) && isatty (1))
- cont = ask_yn("Do you really want to continue", -1);
- else
- cont = 0;
+ printf(_("%s is mounted. "), ctx->filesystem_name);
+ if (!isatty(0) || !isatty(1)) {
+ printf(_("Cannot continue, aborting.\n\n"));
+ exit(FSCK_ERROR);
+ }
+ printf(_("\n\n\007\007\007\007WARNING!!! "
+ "Running e2fsck on a mounted filesystem may cause\n"
+ "SEVERE filesystem damage.\007\007\007\n\n"));
+ cont = ask_yn(_("Do you really want to continue"), -1);
if (!cont) {
- printf ("check aborted.\n");
+ printf (_("check aborted.\n"));
exit (0);
}
return;
return;
if (fs->super->s_state & EXT2_ERROR_FS)
- reason = "contains a file system with errors";
+ reason = _("contains a file system with errors");
else if ((fs->super->s_state & EXT2_VALID_FS) == 0)
- reason = "was not cleanly unmounted";
- else if (fs->super->s_mnt_count >=
- (unsigned) fs->super->s_max_mnt_count)
- reason = "has reached maximal mount count";
+ reason = _("was not cleanly unmounted");
+ else if ((fs->super->s_max_mnt_count >= 0) &&
+ (fs->super->s_mnt_count >=
+ (unsigned) fs->super->s_max_mnt_count))
+ reason = _("has reached maximal mount count");
else if (fs->super->s_checkinterval &&
time(0) >= (fs->super->s_lastcheck +
fs->super->s_checkinterval))
- reason = "has gone too long without being checked";
+ reason = _("has gone too long without being checked");
if (reason) {
- printf("%s %s, check forced.\n", ctx->device_name, reason);
+ printf(_("%s %s, check forced.\n"), ctx->device_name, reason);
return;
}
- printf("%s: clean, %d/%d files, %d/%d blocks\n", ctx->device_name,
+ printf(_("%s: clean, %d/%d files, %d/%d blocks\n"), ctx->device_name,
fs->super->s_inodes_count - fs->super->s_free_inodes_count,
fs->super->s_inodes_count,
fs->super->s_blocks_count - fs->super->s_free_blocks_count,
/*
* For completion notice
*/
+struct percent_tbl {
+ int max_pass;
+ int table[32];
+};
+struct percent_tbl e2fsck_tbl = {
+ 5, { 0, 70, 90, 92, 95, 100 }
+};
+static char bar[] =
+ "==============================================================="
+ "===============================================================";
+static char spaces[] =
+ " "
+ " ";
+
+static float calc_percent(struct percent_tbl *tbl, int pass, int curr,
+ int max)
+{
+ float percent;
+
+ if (pass <= 0)
+ return 0.0;
+ if (pass > tbl->max_pass)
+ return 100.0;
+ percent = ((float) curr) / ((float) max);
+ return ((percent * (tbl->table[pass] - tbl->table[pass-1]))
+ + tbl->table[pass-1]);
+}
+
+extern void e2fsck_clear_progbar(e2fsck_t ctx)
+{
+ if (!(ctx->flags & E2F_FLAG_PROG_BAR))
+ return;
+
+ printf("%s\r", spaces + (sizeof(spaces) - 80));
+ ctx->flags &= ~E2F_FLAG_PROG_BAR;
+}
+
static int e2fsck_update_progress(e2fsck_t ctx, int pass,
unsigned long cur, unsigned long max)
{
const char spinner[] = "\\|/-";
char buf[80];
+ int i;
+ float percent;
+ int tick;
+ struct timeval tv;
+ static int dpywidth = 0;
if (pass == 0)
return 0;
sprintf(buf, "%d %lu %lu\n", pass, cur, max);
write(ctx->progress_fd, buf, strlen(buf));
} else {
+ if (ctx->flags & E2F_FLAG_PROG_SUPPRESS)
+ return 0;
+ if (dpywidth == 0) {
+ dpywidth = 66 - strlen(ctx->device_name);
+ dpywidth = 8 * (dpywidth / 8);
+ }
+ /*
+ * Calculate the new progress position. If the
+ * percentage hasn't changed, then we skip out right
+ * away.
+ */
+ percent = calc_percent(&e2fsck_tbl, pass, cur, max);
+ if (ctx->progress_last_percent == (int) 10 * percent)
+ return 0;
+ ctx->progress_last_percent = (int) 10 * percent;
+
+ /*
+ * If we've already updated the spinner once within
+ * the last 1/8th of a second, no point doing it
+ * again.
+ */
+ gettimeofday(&tv, NULL);
+ tick = (tv.tv_sec << 3) + (tv.tv_usec / (1000000 / 8));
+ if ((tick == ctx->progress_last_time) &&
+ (cur != max) && (cur != 0))
+ return 0;
+ ctx->progress_last_time = tick;
+
+ /*
+ * Advance the spinner, and note that the progress bar
+ * will be on the screen
+ */
ctx->progress_pos = (ctx->progress_pos+1) & 3;
- fputc(spinner[ctx->progress_pos], stdout);
- fputc('\b', stdout);
+ ctx->flags |= E2F_FLAG_PROG_BAR;
+
+ i = ((percent * dpywidth) + 50) / 100;
+ printf("%s: |%s%s", ctx->device_name,
+ bar + (sizeof(bar) - (i+1)),
+ spaces + (sizeof(spaces) - (dpywidth - i + 1)));
+ if (percent == 100.0)
+ fputc('|', stdout);
+ else
+ fputc(spinner[ctx->progress_pos & 3], stdout);
+ printf(" %4.1f%% \r", percent);
+ if (percent == 100.0)
+ e2fsck_clear_progbar(ctx);
fflush(stdout);
}
return 0;
if (fd > 2)
break;
if (fd < 0) {
- fprintf(stderr, "ERROR: Couldn't open /dev/null (%s)\n",
+ fprintf(stderr, _("ERROR: Couldn't open "
+ "/dev/null (%s)\n"),
strerror(errno));
break;
}
close(fd);
}
+#ifdef HAVE_SIGNAL_H
+static e2fsck_t global_signal_ctx;
+
+static void signal_progress_on(int sig)
+{
+ e2fsck_t ctx = global_signal_ctx;
+
+ if (!ctx)
+ return;
+
+ ctx->progress = e2fsck_update_progress;
+ ctx->progress_fd = 0;
+}
+
+static void signal_progress_off(int sig)
+{
+ e2fsck_t ctx = global_signal_ctx;
+
+ if (!ctx)
+ return;
+
+ e2fsck_clear_progbar(ctx);
+ ctx->progress = 0;
+}
+#endif
+
static errcode_t PRS(int argc, char *argv[], e2fsck_t *ret_ctx)
{
int flush = 0;
char *oldpath = getenv("PATH");
e2fsck_t ctx;
errcode_t retval;
+#ifdef HAVE_SIGNAL_H
+ struct sigaction sa;
+#endif
retval = e2fsck_allocate_context(&ctx);
if (retval)
else
ctx->options |= E2F_OPT_TIME;
#else
- fprintf(stderr, "The -t option is not "
- "supported on this version of e2fsck.\n");
+ fprintf(stderr, _("The -t option is not "
+ "supported on this version of e2fsck.\n"));
#endif
break;
case 'c':
#ifdef BLKFLSBUF
flush = 1;
#else
- fatal_error(ctx, "-F not supported");
+ fatal_error(ctx, _("-F not supported"));
#endif
break;
case 'v':
!cflag && !swapfs)
ctx->options |= E2F_OPT_READONLY;
ctx->filesystem_name = argv[optind];
- if (ctx->device_name == 0)
- ctx->device_name = ctx->filesystem_name;
- if (flush) {
#ifdef BLKFLSBUF
+ if (flush) {
int fd = open(ctx->filesystem_name, O_RDONLY, 0);
if (fd < 0) {
- com_err("open", errno, "while opening %s for flushing",
+ com_err("open", errno,
+ _("while opening %s for flushing"),
+ ctx->filesystem_name);
+ exit(FSCK_ERROR);
+ }
+ if (fsync(fd) < 0) {
+ com_err("fsync", errno,
+ _("while trying to flush %s"),
ctx->filesystem_name);
exit(FSCK_ERROR);
}
if (ioctl(fd, BLKFLSBUF, 0) < 0) {
- com_err("BLKFLSBUF", errno, "while trying to flush %s",
+ com_err("BLKFLSBUF", errno,
+ _("while trying to flush %s"),
ctx->filesystem_name);
exit(FSCK_ERROR);
}
close(fd);
-#else
- fatal_error(ctx, "BLKFLSBUF not supported");
-#endif /* BLKFLSBUF */
}
+#endif /* BLKFLSBUF */
if (swapfs) {
if (cflag || bad_blocks_file) {
- fprintf(stderr, "Incompatible options not "
- "allowed when byte-swapping.\n");
+ fprintf(stderr, _("Incompatible options not "
+ "allowed when byte-swapping.\n"));
exit(FSCK_ERROR);
}
}
+#ifdef HAVE_SIGNAL_H
+ /*
+ * Set up signal action
+ */
+ memset(&sa, 0, sizeof(struct sigaction));
+#ifdef SA_RESTART
+ sa.sa_flags = SA_RESTART;
+#endif
+ global_signal_ctx = ctx;
+ sa.sa_handler = signal_progress_on;
+ sigaction(SIGUSR1, &sa, 0);
+ sa.sa_handler = signal_progress_off;
+ sigaction(SIGUSR2, &sa, 0);
+#endif
return 0;
}
#ifdef MCHECK
mcheck(0);
#endif
+#ifdef ENABLE_NLS
+ setlocale(LC_MESSAGES, "");
+ bindtextdomain(NLS_CAT_NAME, LOCALEDIR);
+ textdomain(NLS_CAT_NAME);
+#endif
my_ver = ext2fs_parse_version_string(my_ver_string);
lib_ver = ext2fs_get_library_version(0, &lib_ver_date);
if (my_ver > lib_ver) {
- fprintf( stderr, "Error: ext2fs library version "
- "out of date!\n");
+ fprintf( stderr, _("Error: ext2fs library version "
+ "out of date!\n"));
show_version_only++;
}
retval = PRS(argc, argv, &ctx);
if (retval) {
com_err("e2fsck", retval,
- "while trying to initialize program");
+ _("while trying to initialize program"));
exit(1);
}
reserve_stdio_fds();
#endif
if (!(ctx->options & E2F_OPT_PREEN) || show_version_only)
- fprintf (stderr, "e2fsck %s, %s for EXT2 FS %s, %s\n",
+ fprintf (stderr, _("e2fsck %s, %s for EXT2 FS %s, %s\n"),
my_ver_string, my_ver_date, EXT2FS_VERSION,
EXT2FS_DATE);
if (show_version_only) {
- fprintf(stderr, "\tUsing %s, %s\n",
+ fprintf(stderr, _("\tUsing %s, %s\n"),
error_message(EXT2_ET_BASE), lib_ver_date);
exit(0);
}
!(ctx->options & E2F_OPT_YES)) {
if (!isatty (0) || !isatty (1))
fatal_error(ctx,
- "need terminal for interactive repairs");
+ _("need terminal for interactive repairs"));
}
ctx->superblock = ctx->use_superblock;
restart:
io_ptr = test_io_manager;
test_io_backing_manager = unix_io_manager;
#endif
- flags = (ctx->options & E2F_OPT_READONLY) ? 0 : EXT2_FLAG_RW;
+ flags = 0;
+ if ((ctx->options & E2F_OPT_READONLY) == 0)
+ flags |= EXT2_FLAG_RW;
+
if (ctx->superblock && blocksize) {
retval = ext2fs_open(ctx->filesystem_name, flags,
ctx->superblock, blocksize, io_ptr, &fs);
((retval == EXT2_ET_BAD_MAGIC) ||
((retval == 0) && ext2fs_check_desc(fs)))) {
if (!fs || (fs->group_desc_count > 1)) {
- printf("%s trying backup blocks...\n",
- retval ? "Couldn't find ext2 superblock," :
- "Group descriptors look bad...");
+ printf(_("%s trying backup blocks...\n"),
+ retval ? _("Couldn't find ext2 superblock,") :
+ _("Group descriptors look bad..."));
ctx->superblock = get_backup_sb(fs);
if (fs)
ext2fs_close(fs);
}
}
if (retval) {
- com_err(ctx->program_name, retval, "while trying to open %s",
+ com_err(ctx->program_name, retval, _("while trying to open %s"),
ctx->filesystem_name);
if (retval == EXT2_ET_REV_TOO_HIGH) {
- printf("The filesystem revision is apparently "
+ printf(_("The filesystem revision is apparently "
"too high for this version of e2fsck.\n"
"(Or the filesystem superblock "
- "is corrupt)\n\n");
+ "is corrupt)\n\n"));
fix_problem(ctx, PR_0_SB_CORRUPT, &pctx);
} else if (retval == EXT2_ET_SHORT_READ)
- printf("Could this be a zero-length partition?\n");
+ printf(_("Could this be a zero-length partition?\n"));
else if ((retval == EPERM) || (retval == EACCES))
- printf("You must have %s access to the "
- "filesystem or be root\n",
+ printf(_("You must have %s access to the "
+ "filesystem or be root\n"),
(ctx->options & E2F_OPT_READONLY) ?
"r/o" : "r/w");
else if (retval == ENXIO)
- printf("Possibly non-existent or swap device?\n");
+ printf(_("Possibly non-existent or swap device?\n"));
#ifdef EROFS
else if (retval == EROFS)
- printf("Disk write-protected; use the -n option"
+ printf(_("Disk write-protected; use the -n option "
"to do a read-only\n"
- "check of the device.\n");
+ "check of the device.\n"));
#endif
else
fix_problem(ctx, PR_0_SB_CORRUPT, &pctx);
#ifdef EXT2_CURRENT_REV
if (fs->super->s_rev_level > E2FSCK_CURRENT_REV) {
com_err(ctx->program_name, EXT2_ET_REV_TOO_HIGH,
- "while trying to open %s",
+ _("while trying to open %s"),
ctx->filesystem_name);
get_newer:
- fatal_error(ctx, "Get a newer version of e2fsck!");
+ fatal_error(ctx, _("Get a newer version of e2fsck!"));
}
#endif
+ s = (struct ext2fs_sb *) fs->super;
+ /*
+ * Check to see if we need to do ext3-style recovery. If so,
+ * do it, and then restart the fsck.
+ */
+ if (s->s_feature_incompat & EXT3_FEATURE_INCOMPAT_RECOVER) {
+ printf("%s: reading journal for ext3 filesystem...\n",
+ ctx->filesystem_name);
+ ext2fs_close(fs);
+ retval = e2fsck_run_ext3_journal(ctx->filesystem_name);
+ if (retval) {
+ com_err(ctx->program_name, retval,
+ ": couldn't load ext3 journal for %s",
+ ctx->filesystem_name);
+ exit(FSCK_ERROR);
+ }
+ goto restart;
+ }
/*
* Check for compatibility with the feature sets. We need to
* be more stringent than ext2fs_open().
*/
- s = (struct ext2fs_sb *) fs->super;
if ((s->s_feature_compat & ~EXT2_LIB_FEATURE_COMPAT_SUPP) ||
(s->s_feature_incompat & ~EXT2_LIB_FEATURE_INCOMPAT_SUPP)) {
com_err(ctx->program_name, EXT2_ET_UNSUPP_FEATURE,
"(%s)", ctx->filesystem_name);
goto get_newer;
}
+#ifdef ENABLE_COMPRESSION
+ if (s->s_feature_incompat & EXT2_FEATURE_INCOMPAT_COMPRESSION)
+ com_err(ctx->program_name, 0,
+ _("Warning: compression support is experimental.\n"));
+#endif
+ if (ctx->device_name == 0 &&
+ (s->s_volume_name[0] != 0)) {
+ char *cp = malloc(sizeof(s->s_volume_name)+1);
+ if (cp) {
+ strncpy(cp, s->s_volume_name,
+ sizeof(s->s_volume_name));
+ cp[sizeof(s->s_volume_name)] = 0;
+ ctx->device_name = cp;
+ }
+ }
+ if (ctx->device_name == 0)
+ ctx->device_name = ctx->filesystem_name;
/*
* If the user specified a specific superblock, presumably the
if (normalize_swapfs) {
if ((fs->flags & EXT2_FLAG_SWAP_BYTES) ==
ext2fs_native_flag()) {
- fprintf(stderr, "%s: Filesystem byte order "
- "already normalized.\n", ctx->device_name);
+ fprintf(stderr, _("%s: Filesystem byte order "
+ "already normalized.\n"), ctx->device_name);
exit(FSCK_ERROR);
}
}
retval = ext2fs_read_bb_inode(fs, &fs->badblocks);
if (retval) {
com_err(ctx->program_name, retval,
- "while reading bad blocks inode");
+ _("while reading bad blocks inode"));
preenhalt(ctx);
- printf("This doesn't bode well, but we'll try to go on...\n");
+ printf(_("This doesn't bode well,"
+ " but we'll try to go on...\n"));
}
run_result = e2fsck_run(ctx);
+ e2fsck_clear_progbar(ctx);
if (run_result == E2F_FLAG_RESTART) {
- printf("Restarting e2fsck from the beginning...\n");
+ printf(_("Restarting e2fsck from the beginning...\n"));
retval = e2fsck_reset_context(ctx);
if (retval) {
com_err(ctx->program_name, retval,
- "while resetting context");
+ _("while resetting context"));
exit(1);
}
ext2fs_close(fs);
if (ext2fs_test_changed(fs)) {
exit_value = FSCK_NONDESTRUCT;
if (!(ctx->options & E2F_OPT_PREEN))
- printf("\n%s: ***** FILE SYSTEM WAS MODIFIED *****\n",
+ printf(_("\n%s: ***** FILE SYSTEM WAS MODIFIED *****\n"),
ctx->device_name);
if (root_filesystem && !read_only_root) {
- printf("%s: ***** REBOOT LINUX *****\n",
+ printf(_("%s: ***** REBOOT LINUX *****\n"),
ctx->device_name);
exit_value = FSCK_REBOOT;
}
print_resource_track(NULL, &ctx->global_rtrack);
#endif
- e2fsck_free_context(ctx);
ext2fs_close(fs);
+ ctx->fs = NULL;
+ e2fsck_free_context(ctx);
return exit_value;
}
git://git.whamcloud.com / tools / e2fsprogs.git / blobdiff