diff options
| author | Theodore Ts'o <tytso@mit.edu> | 1998-02-24 20:22:23 +0000 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 1998-02-24 20:22:23 +0000 |
| commit | a02ce9df5ff5db2982462aec7162f7142dc18131 (patch) | |
| tree | a6ce1c09cdc656322360b6286109433306978879 /e2fsck/unix.c | |
| parent | c775256443ff12edef2b72f47dcdcf50d1dc3526 (diff) | |
| download | e2fsprogs-a02ce9df5ff5db2982462aec7162f7142dc18131.tar.gz | |
Many files:
Change the progress function to return an integer; if returns 1, then
the progress function is expected to have set the e2fsck context flag
signalling a user abort, and the caller should also initiate a user
abort.
Diffstat (limited to 'e2fsck/unix.c')
| -rw-r--r-- | e2fsck/unix.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/e2fsck/unix.c b/e2fsck/unix.c index 10b3e8aa..5d36a756 100644 --- a/e2fsck/unix.c +++ b/e2fsck/unix.c @@ -567,14 +567,14 @@ restart: if (ctx->superblock) set_latch_flags(PR_LATCH_RELOC, PRL_LATCHED, 0); check_super_block(ctx); - if (ctx->flags & E2F_FLAG_ABORT) + if (ctx->flags & E2F_FLAG_SIGNAL_MASK) exit(FSCK_ERROR); check_if_skip(ctx); if (bad_blocks_file) read_bad_blocks_file(ctx, bad_blocks_file, replace_bad_blocks); else if (cflag) test_disk(ctx); - if (ctx->flags & E2F_FLAG_ABORT) + if (ctx->flags & E2F_FLAG_SIGNAL_MASK) exit(FSCK_ERROR); if (normalize_swapfs) { @@ -587,7 +587,7 @@ restart: } if (swapfs) { swap_filesys(ctx); - if (ctx->flags & E2F_FLAG_ABORT) + if (ctx->flags & E2F_FLAG_SIGNAL_MASK) exit(FSCK_ERROR); } @@ -616,7 +616,7 @@ restart: } goto restart; } - if (run_result & E2F_FLAG_ABORT) + if (run_result & E2F_FLAG_SIGNAL_MASK) exit(FSCK_ERROR); if (run_result & E2F_FLAG_CANCEL) ext2fs_unmark_valid(fs); |