summaryrefslogtreecommitdiff
path: root/e2fsck/iscan.c
diff options
context:
space:
mode:
authorTheodore Ts'o <tytso@mit.edu>1997-11-14 05:23:04 +0000
committerTheodore Ts'o <tytso@mit.edu>1997-11-14 05:23:04 +0000
commitf8188fff23dc2d9c9f858fb21264e46b17672825 (patch)
tree003f979b0273e095a216787bff3cb14fc7dfb99b /e2fsck/iscan.c
parentd36d835b48f3c280b254a9ca6d519d5c97d14ad4 (diff)
downloade2fsprogs-f8188fff23dc2d9c9f858fb21264e46b17672825.tar.gz
Many files:
pass1.c, pass2.c, pass3.c, pass4.c, pass5.c: Add calls to the progress indicator function. pass1.c (scan_callback): Add call to the progress feedback function (if it exists). super.c (check_super_block): Skip the device size check if the get_device_size returns EXT2_EXT_UNIMPLEMENTED. iscan.c (main): Don't use fatal_error() anymore. pass1b.c, swapfs.c, badblocks.c: Set E2F_FLAG_ABORT instead of calling fatal_error(0). problem.c, pass3.c (PR_3_ROOT_NOT_DIR_ABORT, PR_3_NO_ROOT_INODE_ABORT): New problem codes. problem.c, pass2.c (PR_2_SPLIT_DOT): New problem code. problem.c, pass1.c (PR_1_SUPPRESS_MESSAGES): New problem code. problemP.h: New file which separates out the private fix_problem data structures. util.c, dirinfo.c, pass1.c, pass1b.c, pass2.c, pass5.c, super.c, swapfs.c util.c: allocate_memory() now takes a e2fsck context as its first argument, and rename it to be e2fsck_allocate_memory(). problemP.h: New file which contains the private problem abstraction definitions. Makefile.pq: Remove include of MAKEFILE.STD, which doesn't exist at this point.
Diffstat (limited to 'e2fsck/iscan.c')
-rw-r--r--e2fsck/iscan.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/e2fsck/iscan.c b/e2fsck/iscan.c
index 5a67b945..72acb016 100644
--- a/e2fsck/iscan.c
+++ b/e2fsck/iscan.c
@@ -66,7 +66,8 @@ static void PRS(int argc, char *argv[])
#ifdef BLKFLSBUF
flush = 1;
#else
- fatal_error ("-F not supported");
+ fprintf(stderr, "-F not supported");
+ exit(1);
#endif
break;
case 'I':
@@ -92,7 +93,8 @@ static void PRS(int argc, char *argv[])
}
close(fd);
#else
- fatal_error ("BLKFLSBUF not supported");
+ fprintf(stderr, "BLKFLSBUF not supported");
+ exit(1);
#endif /* BLKFLSBUF */
}
}
@@ -124,7 +126,7 @@ int main (int argc, char *argv[])
retval = ext2fs_open_inode_scan(fs, inode_buffer_blocks, &scan);
if (retval) {
com_err(program_name, retval, "while opening inode scan");
- fatal_error(0);
+ exit(1);
}
while (1) {
@@ -132,7 +134,7 @@ int main (int argc, char *argv[])
if (retval) {
com_err(program_name, retval,
"while getting next inode");
- fatal_error(0);
+ exit(1);
}
if (ino == 0)
break;