From ecc859b2819cd8772ba660b9229489378e541838 Mon Sep 17 00:00:00 2001 From: Phillip Susi Date: Tue, 24 Dec 2013 23:41:34 -0500 Subject: [PATCH] e2image: handle SIGINT safely When doing an in place move, interrupting it past the point of no return will destroy the filesystem since parts of it have been overwritten. Catch SIGINT the first time and issue a warning if this is the case. Signed-off-by: Phillip Susi Signed-off-by: "Theodore Ts'o" --- misc/e2image.c | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/misc/e2image.c b/misc/e2image.c index bdadfe7..4862118 100644 --- a/misc/e2image.c +++ b/misc/e2image.c @@ -35,6 +35,7 @@ extern int optind; #include #include #include +#include #include "ext2fs/ext2_fs.h" #include "ext2fs/ext2fs.h" @@ -488,6 +489,14 @@ static void scramble_dir_block(ext2_filsys fs, blk64_t blk, char *buf) } } +static char got_sigint; + +static void sigint_handler(int unsused) +{ + got_sigint = 1; + signal (SIGINT, SIG_DFL); +} + static void output_meta_data_blocks(ext2_filsys fs, int fd) { errcode_t retval; @@ -531,10 +540,39 @@ static void output_meta_data_blocks(ext2_filsys fs, int fd) if (distance < ext2fs_blocks_count(fs->super)) start = ext2fs_blocks_count(fs->super) - distance; } + if (move_mode) + signal (SIGINT, sigint_handler); more_blocks: if (distance) ext2fs_llseek (fd, (start * fs->blocksize) + dest_offset, SEEK_SET); for (blk = start; blk < end; blk++) { + if (got_sigint) { + if (distance) { + /* moving to the right */ + if (distance >= ext2fs_blocks_count(fs->super) || + start == ext2fs_blocks_count(fs->super) - distance) + kill (getpid(), SIGINT); + } else { + /* moving to the left */ + if (blk < (source_offset - dest_offset) / fs->blocksize) + kill (getpid(), SIGINT); + } + if (show_progress) + printf ("\r"); + printf ("Stopping now will destroy the filesystem, " + "interrupt again if you are sure\n"); + if (show_progress) { + printf("Copying "); + bscount = printf("%llu / %llu blocks (%llu%%)", + total_written, + meta_blocks_count, + (total_written + 50) / ((meta_blocks_count + 50) + / 100)); + fflush(stdout); + } + + got_sigint = 0; + } if (show_progress && last_update != time(NULL)) { last_update = time(NULL); while (bscount--) @@ -604,6 +642,7 @@ more_blocks: sparse = 0; goto more_blocks; } + signal (SIGINT, SIG_DFL); if (show_progress) { while (bscount--) printf("\b"); -- 1.8.3.1