--- trunk/mkinitrd-magellan/busybox/util-linux/fsck_minix.c	2007/09/01 22:45:15	532
+++ trunk/mkinitrd-magellan/busybox/util-linux/fsck_minix.c	2009/04/24 18:33:46	816
@@ -29,7 +29,7 @@
  * 28.02.93  -	added support for different directory entry sizes..
  *
  * Sat Mar  6 18:59:42 1993, faith@cs.unc.edu: Output namelen with
- *                           super-block information
+ *                           superblock information
  *
  * Sat Oct  9 11:17:11 1993, faith@cs.unc.edu: make exit status conform
  *                           to that required by fsutil
@@ -64,7 +64,7 @@
  * 06.11.96  - Added v2 code submitted by Joerg Dorchain, but written by
  *             Andreas Schwab.
  *
- * 1999-02-22 Arkadiusz Mi¶kiewicz <misiek@misiek.eu.org>
+ * 1999-02-22 Arkadiusz Mickiewicz <misiek@misiek.eu.org>
  * - added Native Language Support
  *
  *
@@ -79,7 +79,7 @@
  *	-a for automatic repairs (not implemented)
  *	-r for repairs (interactive) (not implemented)
  *	-v for verbose (tells how many files)
- *	-s for super-block info
+ *	-s for superblock info
  *	-m for minix-like "mode not cleared" warnings
  *	-f force filesystem check even if filesystem marked as valid
  *
@@ -87,57 +87,143 @@
  * enforced (but it's not much fun on a character device :-).
  */
 
-#include "busybox.h"
 #include <mntent.h>
-
+#include "libbb.h"
 #include "minix.h"
 
 #ifndef BLKGETSIZE
 #define BLKGETSIZE _IO(0x12,96)    /* return device size */
 #endif
 
-#ifdef UNUSED
+struct BUG_bad_inode_size {
+	char BUG_bad_inode1_size[(INODE_SIZE1 * MINIX1_INODES_PER_BLOCK != BLOCK_SIZE) ? -1 : 1];
+#if ENABLE_FEATURE_MINIX2
+	char BUG_bad_inode2_size[(INODE_SIZE2 * MINIX2_INODES_PER_BLOCK != BLOCK_SIZE) ? -1 : 1];
+#endif
+};
+
 enum {
+#ifdef UNUSED
 	MINIX1_LINK_MAX = 250,
 	MINIX2_LINK_MAX = 65530,
 	MINIX_I_MAP_SLOTS = 8,
 	MINIX_Z_MAP_SLOTS = 64,
 	MINIX_V1 = 0x0001,      /* original minix fs */
 	MINIX_V2 = 0x0002,      /* minix V2 fs */
-	NAME_MAX = 255,         /* # chars in a file name */
+#endif
+	MINIX_NAME_MAX = 255,         /* # chars in a file name */
 };
+
+
+#if !ENABLE_FEATURE_MINIX2
+enum { version2 = 0 };
 #endif
 
+enum { MAX_DEPTH = 32 };
+
+enum { dev_fd = 3 };
+
+struct globals {
 #if ENABLE_FEATURE_MINIX2
-static smallint version2;
-#else
-enum { version2 = 0 };
+	smallint version2;
 #endif
+	smallint changed;  /* is filesystem modified? */
+	smallint errors_uncorrected;  /* flag if some error was not corrected */
+	smallint termios_set;
+	smallint dirsize;
+	smallint namelen;
+	const char *device_name;
+	int directory, regular, blockdev, chardev, links, symlinks, total;
+	char *inode_buffer;
+
+	char *inode_map;
+	char *zone_map;
+
+	unsigned char *inode_count;
+	unsigned char *zone_count;
+
+	/* File-name data */
+	int name_depth;
+	char *name_component[MAX_DEPTH+1];
+
+	/* Bigger stuff */
+	struct termios sv_termios;
+	char superblock_buffer[BLOCK_SIZE];
+	char add_zone_ind_blk[BLOCK_SIZE];
+	char add_zone_dind_blk[BLOCK_SIZE];
+	USE_FEATURE_MINIX2(char add_zone_tind_blk[BLOCK_SIZE];)
+	char check_file_blk[BLOCK_SIZE];
+
+	/* File-name data */
+	char current_name[MAX_DEPTH * MINIX_NAME_MAX];
+};
+
+#define G (*ptr_to_globals)
+#if ENABLE_FEATURE_MINIX2
+#define version2           (G.version2           )
+#endif
+#define changed            (G.changed            )
+#define errors_uncorrected (G.errors_uncorrected )
+#define termios_set        (G.termios_set        )
+#define dirsize            (G.dirsize            )
+#define namelen            (G.namelen            )
+#define device_name        (G.device_name        )
+#define directory          (G.directory          )
+#define regular            (G.regular            )
+#define blockdev           (G.blockdev           )
+#define chardev            (G.chardev            )
+#define links              (G.links              )
+#define symlinks           (G.symlinks           )
+#define total              (G.total              )
+#define inode_buffer       (G.inode_buffer       )
+#define inode_map          (G.inode_map          )
+#define zone_map           (G.zone_map           )
+#define inode_count        (G.inode_count        )
+#define zone_count         (G.zone_count         )
+#define name_depth         (G.name_depth         )
+#define name_component     (G.name_component     )
+#define sv_termios         (G.sv_termios         )
+#define superblock_buffer  (G.superblock_buffer )
+#define add_zone_ind_blk   (G.add_zone_ind_blk   )
+#define add_zone_dind_blk  (G.add_zone_dind_blk  )
+#define add_zone_tind_blk  (G.add_zone_tind_blk  )
+#define check_file_blk     (G.check_file_blk     )
+#define current_name       (G.current_name       )
+#define INIT_G() do { \
+	SET_PTR_TO_GLOBALS(xzalloc(sizeof(G))); \
+	dirsize = 16; \
+	namelen = 14; \
+	current_name[0] = '/'; \
+	/*current_name[1] = '\0';*/ \
+	name_component[0] = &current_name[0]; \
+} while (0)
+
+
+#define OPTION_STR "larvsmf"
+enum {
+	OPT_l = (1 << 0),
+	OPT_a = (1 << 1),
+	OPT_r = (1 << 2),
+	OPT_v = (1 << 3),
+	OPT_s = (1 << 4),
+	OPT_w = (1 << 5),
+	OPT_f = (1 << 6),
+};
+#define OPT_list      (option_mask32 & OPT_l)
+#define OPT_automatic (option_mask32 & OPT_a)
+#define OPT_repair    (option_mask32 & OPT_r)
+#define OPT_verbose   (option_mask32 & OPT_v)
+#define OPT_show      (option_mask32 & OPT_s)
+#define OPT_warn_mode (option_mask32 & OPT_w)
+#define OPT_force     (option_mask32 & OPT_f)
+/* non-automatic repairs requested? */
+#define OPT_manual    ((option_mask32 & (OPT_a|OPT_r)) == OPT_r)
 
-#define PROGRAM_VERSION "1.2 - 11/11/96"
-static smallint repair, automatic, verbose, list, show, warn_mode, force;
-static smallint changed;  /* is filesystem modified? */
-static smallint errors_uncorrected;  /* flag if some error was not corrected */
-
-static smallint termios_set;
-static struct termios termios;
-
-static char *device_name;
-static int IN;
-static int directory, regular, blockdev, chardev, links, symlinks, total;
-
-//also smallint?
-static int dirsize = 16;
-static int namelen = 14;
-
-static char *inode_buffer;
-//xzalloc?
-static char super_block_buffer[BLOCK_SIZE];
 
 #define Inode1 (((struct minix1_inode *) inode_buffer)-1)
 #define Inode2 (((struct minix2_inode *) inode_buffer)-1)
 
-#define Super (*(struct minix_super_block *)super_block_buffer)
+#define Super (*(struct minix_superblock *)(superblock_buffer))
 
 #if ENABLE_FEATURE_MINIX2
 # define ZONES    ((unsigned)(version2 ? Super.s_zones : Super.s_nzones))
@@ -153,40 +239,49 @@
 #define MAGIC     (Super.s_magic)
 
 /* gcc likes this more (code is smaller) than macro variant */
-static ATTRIBUTE_ALWAYS_INLINE unsigned div_roundup(unsigned size, unsigned n)
+static ALWAYS_INLINE unsigned div_roundup(unsigned size, unsigned n)
 {
 	return (size + n-1) / n;
 }
 
-#if ENABLE_FEATURE_MINIX2
-#define INODE_BLOCKS div_roundup(INODES, (version2 ? MINIX2_INODES_PER_BLOCK \
-				    : MINIX1_INODES_PER_BLOCK))
+#if !ENABLE_FEATURE_MINIX2
+#define INODE_BLOCKS            div_roundup(INODES, MINIX1_INODES_PER_BLOCK)
 #else
-#define INODE_BLOCKS div_roundup(INODES, MINIX1_INODES_PER_BLOCK)
+#define INODE_BLOCKS            div_roundup(INODES, \
+                                (version2 ? MINIX2_INODES_PER_BLOCK : MINIX1_INODES_PER_BLOCK))
 #endif
 
-#define INODE_BUFFER_SIZE (INODE_BLOCKS * BLOCK_SIZE)
-#define NORM_FIRSTZONE    (2 + IMAPS + ZMAPS + INODE_BLOCKS)
+#define INODE_BUFFER_SIZE       (INODE_BLOCKS * BLOCK_SIZE)
+#define NORM_FIRSTZONE          (2 + IMAPS + ZMAPS + INODE_BLOCKS)
 
-static char *inode_map;
-static char *zone_map;
+/* Before you ask "where they come from?": */
+/* setbit/clrbit are supplied by sys/param.h */
 
-static unsigned char *inode_count;
-static unsigned char *zone_count;
+static int minix_bit(const char *a, unsigned i)
+{
+	return (a[i >> 3] & (1<<(i & 7)));
+}
 
-static int bit(char *a, unsigned i)
+static void minix_setbit(char *a, unsigned i)
 {
-	return (a[i >> 3] & (1<<(i & 7))) != 0;
+	setbit(a, i);
+	changed = 1;
+}
+static void minix_clrbit(char *a, unsigned i)
+{
+	clrbit(a, i);
+	changed = 1;
 }
 
-#define inode_in_use(x) (bit(inode_map,(x)))
-#define zone_in_use(x) (bit(zone_map,(x)-FIRSTZONE+1))
+/* Note: do not assume 0/1, it is 0/nonzero */
+#define zone_in_use(x)  (minix_bit(zone_map,(x)-FIRSTZONE+1))
+#define inode_in_use(x) (minix_bit(inode_map,(x)))
 
-#define mark_inode(x) (setbit(inode_map,(x)),changed=1)
-#define unmark_inode(x) (clrbit(inode_map,(x)),changed=1)
+#define mark_inode(x)   (minix_setbit(inode_map,(x)))
+#define unmark_inode(x) (minix_clrbit(inode_map,(x)))
 
-#define mark_zone(x) (setbit(zone_map,(x)-FIRSTZONE+1),changed=1)
-#define unmark_zone(x) (clrbit(zone_map,(x)-FIRSTZONE+1),changed=1)
+#define mark_zone(x)    (minix_setbit(zone_map,(x)-FIRSTZONE+1))
+#define unmark_zone(x)  (minix_clrbit(zone_map,(x)-FIRSTZONE+1))
 
 
 static void recursive_check(unsigned ino);
@@ -194,39 +289,14 @@
 static void recursive_check2(unsigned ino);
 #endif
 
-static void die(const char *str) ATTRIBUTE_NORETURN;
+static void die(const char *str) NORETURN;
 static void die(const char *str)
 {
 	if (termios_set)
-		tcsetattr(0, TCSANOW, &termios);
+		tcsetattr_stdin_TCSANOW(&sv_termios);
 	bb_error_msg_and_die("%s", str);
 }
 
-/* File-name data */
-enum { MAX_DEPTH = 32 };
-static int name_depth;
-static char *current_name;
-static char *name_component[MAX_DEPTH+1];
-
-/* Wed Feb  9 15:17:06 MST 2000 */
-/* dynamically allocate name_list (instead of making it static) */
-static void alloc_current_name(void)
-{
-	current_name = xmalloc(MAX_DEPTH * (BUFSIZ + 1));
-	current_name[0] = '/';
-	current_name[1] = '\0';
-	name_component[0] = &current_name[0];
-}
-
-#if ENABLE_FEATURE_CLEAN_UP
-/* execute this atexit() to deallocate name_list[] */
-/* piptigger was here */
-static void free_current_name(void)
-{
-	free(current_name);
-}
-#endif
-
 static void push_filename(const char *name)
 {
 	//  /dir/dir/dir/file
@@ -258,13 +328,13 @@
 {
 	int c;
 
-	if (!repair) {
-		puts("");
+	if (!OPT_repair) {
+		bb_putchar('\n');
 		errors_uncorrected = 1;
 		return 0;
 	}
-	if (automatic) {
-		puts("");
+	if (OPT_automatic) {
+		bb_putchar('\n');
 		if (!def)
 			errors_uncorrected = 1;
 		return def;
@@ -308,7 +378,7 @@
 	struct mntent *mnt;
 	int cont;
 	int fd;
-
+//XXX:FIXME use find_mount_point()
 	f = setmntent(MOUNTED, "r");
 	if (f == NULL)
 		return;
@@ -335,7 +405,7 @@
 		cont = ask("Do you really want to continue", 0);
 	if (!cont) {
 		printf("Check aborted\n");
-		exit(0);
+		exit(EXIT_SUCCESS);
 	}
 }
 
@@ -375,20 +445,16 @@
 /*
  * read-block reads block nr into the buffer at addr.
  */
-static void read_block(unsigned nr, char *addr)
+static void read_block(unsigned nr, void *addr)
 {
 	if (!nr) {
 		memset(addr, 0, BLOCK_SIZE);
 		return;
 	}
-	if (BLOCK_SIZE * nr != lseek(IN, BLOCK_SIZE * nr, SEEK_SET)) {
-		printf("%s: cannot seek to block in file '%s'\n",
-				bb_msg_read_error, current_name);
-		errors_uncorrected = 1;
-		memset(addr, 0, BLOCK_SIZE);
-	} else if (BLOCK_SIZE != read(IN, addr, BLOCK_SIZE)) {
-		printf("%s: bad block in file '%s'\n",
-				bb_msg_read_error, current_name);
+	xlseek(dev_fd, BLOCK_SIZE * nr, SEEK_SET);
+	if (BLOCK_SIZE != full_read(dev_fd, addr, BLOCK_SIZE)) {
+		printf("%s: bad block %u in file '%s'\n",
+				bb_msg_read_error, nr, current_name);
 		errors_uncorrected = 1;
 		memset(addr, 0, BLOCK_SIZE);
 	}
@@ -397,7 +463,7 @@
 /*
  * write_block writes block nr to disk.
  */
-static void write_block(unsigned nr, char *addr)
+static void write_block(unsigned nr, void *addr)
 {
 	if (!nr)
 		return;
@@ -407,11 +473,10 @@
 		errors_uncorrected = 1;
 		return;
 	}
-	if (BLOCK_SIZE * nr != lseek(IN, BLOCK_SIZE * nr, SEEK_SET))
-		die("seek failed in write_block");
-	if (BLOCK_SIZE != write(IN, addr, BLOCK_SIZE)) {
-		printf("%s: bad block in file '%s'\n",
-				bb_msg_write_error, current_name);
+	xlseek(dev_fd, BLOCK_SIZE * nr, SEEK_SET);
+	if (BLOCK_SIZE != full_write(dev_fd, addr, BLOCK_SIZE)) {
+		printf("%s: bad block %u in file '%s'\n",
+				bb_msg_write_error, nr, current_name);
 		errors_uncorrected = 1;
 	}
 }
@@ -424,7 +489,6 @@
 static int map_block(struct minix1_inode *inode, unsigned blknr)
 {
 	uint16_t ind[BLOCK_SIZE >> 1];
-	uint16_t dind[BLOCK_SIZE >> 1];
 	int block, result;
 	smallint blk_chg;
 
@@ -433,26 +497,22 @@
 	blknr -= 7;
 	if (blknr < 512) {
 		block = check_zone_nr(inode->i_zone + 7, &changed);
-		read_block(block, (char *) ind);
-		blk_chg = 0;
-		result = check_zone_nr(blknr + ind, &blk_chg);
-		if (blk_chg)
-			write_block(block, (char *) ind);
-		return result;
+		goto common;
 	}
 	blknr -= 512;
 	block = check_zone_nr(inode->i_zone + 8, &changed);
-	read_block(block, (char *) dind);
+	read_block(block, ind); /* double indirect */
 	blk_chg = 0;
-	result = check_zone_nr(dind + (blknr / 512), &blk_chg);
+	result = check_zone_nr(&ind[blknr / 512], &blk_chg);
 	if (blk_chg)
-		write_block(block, (char *) dind);
+		write_block(block, ind);
 	block = result;
-	read_block(block, (char *) ind);
+ common:
+	read_block(block, ind);
 	blk_chg = 0;
-	result = check_zone_nr(ind + (blknr % 512), &blk_chg);
+	result = check_zone_nr(&ind[blknr % 512], &blk_chg);
 	if (blk_chg)
-		write_block(block, (char *) ind);
+		write_block(block, ind);
 	return result;
 }
 
@@ -460,8 +520,6 @@
 static int map_block2(struct minix2_inode *inode, unsigned blknr)
 {
 	uint32_t ind[BLOCK_SIZE >> 2];
-	uint32_t dind[BLOCK_SIZE >> 2];
-	uint32_t tind[BLOCK_SIZE >> 2];
 	int block, result;
 	smallint blk_chg;
 
@@ -470,53 +528,39 @@
 	blknr -= 7;
 	if (blknr < 256) {
 		block = check_zone_nr2(inode->i_zone + 7, &changed);
-		read_block(block, (char *) ind);
-		blk_chg = 0;
-		result = check_zone_nr2(blknr + ind, &blk_chg);
-		if (blk_chg)
-			write_block(block, (char *) ind);
-		return result;
+		goto common2;
 	}
 	blknr -= 256;
-	if (blknr >= 256 * 256) {
+	if (blknr < 256 * 256) {
 		block = check_zone_nr2(inode->i_zone + 8, &changed);
-		read_block(block, (char *) dind);
-		blk_chg = 0;
-		result = check_zone_nr2(dind + blknr / 256, &blk_chg);
-		if (blk_chg)
-			write_block(block, (char *) dind);
-		block = result;
-		read_block(block, (char *) ind);
-		blk_chg = 0;
-		result = check_zone_nr2(ind + blknr % 256, &blk_chg);
-		if (blk_chg)
-			write_block(block, (char *) ind);
-		return result;
+		goto common1;
 	}
 	blknr -= 256 * 256;
 	block = check_zone_nr2(inode->i_zone + 9, &changed);
-	read_block(block, (char *) tind);
+	read_block(block, ind); /* triple indirect */
 	blk_chg = 0;
-	result = check_zone_nr2(tind + blknr / (256 * 256), &blk_chg);
+	result = check_zone_nr2(&ind[blknr / (256 * 256)], &blk_chg);
 	if (blk_chg)
-		write_block(block, (char *) tind);
+		write_block(block, ind);
 	block = result;
-	read_block(block, (char *) dind);
+ common1:
+	read_block(block, ind); /* double indirect */
 	blk_chg = 0;
-	result = check_zone_nr2(dind + (blknr / 256) % 256, &blk_chg);
+	result = check_zone_nr2(&ind[(blknr / 256) % 256], &blk_chg);
 	if (blk_chg)
-		write_block(block, (char *) dind);
+		write_block(block, ind);
 	block = result;
-	read_block(block, (char *) ind);
+ common2:
+	read_block(block, ind);
 	blk_chg = 0;
-	result = check_zone_nr2(ind + blknr % 256, &blk_chg);
+	result = check_zone_nr2(&ind[blknr % 256], &blk_chg);
 	if (blk_chg)
-		write_block(block, (char *) ind);
+		write_block(block, ind);
 	return result;
 }
 #endif
 
-static void write_super_block(void)
+static void write_superblock(void)
 {
 	/*
 	 * Set the state of the filesystem based on whether or not there
@@ -527,21 +571,20 @@
 	if (!errors_uncorrected)
 		Super.s_state &= ~MINIX_ERROR_FS;
 
-	if (BLOCK_SIZE != lseek(IN, BLOCK_SIZE, SEEK_SET))
-		die("seek failed in write_super_block");
-	if (BLOCK_SIZE != write(IN, super_block_buffer, BLOCK_SIZE))
-		die("cannot write super-block");
+	xlseek(dev_fd, BLOCK_SIZE, SEEK_SET);
+	if (BLOCK_SIZE != full_write(dev_fd, superblock_buffer, BLOCK_SIZE))
+		die("cannot write superblock");
 }
 
 static void write_tables(void)
 {
-	write_super_block();
+	write_superblock();
 
-	if (IMAPS * BLOCK_SIZE != write(IN, inode_map, IMAPS * BLOCK_SIZE))
+	if (IMAPS * BLOCK_SIZE != write(dev_fd, inode_map, IMAPS * BLOCK_SIZE))
 		die("cannot write inode map");
-	if (ZMAPS * BLOCK_SIZE != write(IN, zone_map, ZMAPS * BLOCK_SIZE))
+	if (ZMAPS * BLOCK_SIZE != write(dev_fd, zone_map, ZMAPS * BLOCK_SIZE))
 		die("cannot write zone map");
-	if (INODE_BUFFER_SIZE != write(IN, inode_buffer, INODE_BUFFER_SIZE))
+	if (INODE_BUFFER_SIZE != write(dev_fd, inode_buffer, INODE_BUFFER_SIZE))
 		die("cannot write inodes");
 }
 
@@ -570,10 +613,9 @@
 
 static void read_superblock(void)
 {
-	if (BLOCK_SIZE != lseek(IN, BLOCK_SIZE, SEEK_SET))
-		die("seek failed");
-	if (BLOCK_SIZE != read(IN, super_block_buffer, BLOCK_SIZE))
-		die("cannot read super block");
+	xlseek(dev_fd, BLOCK_SIZE, SEEK_SET);
+	if (BLOCK_SIZE != full_read(dev_fd, superblock_buffer, BLOCK_SIZE))
+		die("cannot read superblock");
 	/* already initialized to:
 	namelen = 14;
 	dirsize = 16;
@@ -592,13 +634,13 @@
 		version2 = 1;
 #endif
 	} else
-		die("bad magic number in super-block");
+		die("bad magic number in superblock");
 	if (ZONESIZE != 0 || BLOCK_SIZE != 1024)
 		die("only 1k blocks/zones supported");
 	if (IMAPS * BLOCK_SIZE * 8 < INODES + 1)
-		die("bad s_imap_blocks field in super-block");
+		die("bad s_imap_blocks field in superblock");
 	if (ZMAPS * BLOCK_SIZE * 8 < ZONES - FIRSTZONE + 1)
-		die("bad s_zmap_blocks field in super-block");
+		die("bad s_zmap_blocks field in superblock");
 }
 
 static void read_tables(void)
@@ -608,18 +650,18 @@
 	inode_buffer = xmalloc(INODE_BUFFER_SIZE);
 	inode_count = xmalloc(INODES + 1);
 	zone_count = xmalloc(ZONES);
-	if (IMAPS * BLOCK_SIZE != read(IN, inode_map, IMAPS * BLOCK_SIZE))
+	if (IMAPS * BLOCK_SIZE != read(dev_fd, inode_map, IMAPS * BLOCK_SIZE))
 		die("cannot read inode map");
-	if (ZMAPS * BLOCK_SIZE != read(IN, zone_map, ZMAPS * BLOCK_SIZE))
+	if (ZMAPS * BLOCK_SIZE != read(dev_fd, zone_map, ZMAPS * BLOCK_SIZE))
 		die("cannot read zone map");
-	if (INODE_BUFFER_SIZE != read(IN, inode_buffer, INODE_BUFFER_SIZE))
+	if (INODE_BUFFER_SIZE != read(dev_fd, inode_buffer, INODE_BUFFER_SIZE))
 		die("cannot read inodes");
 	if (NORM_FIRSTZONE != FIRSTZONE) {
 		printf("warning: firstzone!=norm_firstzone\n");
 		errors_uncorrected = 1;
 	}
 	get_dirsize();
-	if (show) {
+	if (OPT_show) {
 		printf("%u inodes\n"
 			"%u blocks\n"
 			"Firstdatazone=%u (%u)\n"
@@ -637,41 +679,35 @@
 	}
 }
 
-static struct minix1_inode *get_inode(unsigned nr)
+static void get_inode_common(unsigned nr, uint16_t i_mode)
 {
-	struct minix1_inode *inode;
-
-	if (!nr || nr > INODES)
-		return NULL;
 	total++;
-	inode = Inode1 + nr;
 	if (!inode_count[nr]) {
 		if (!inode_in_use(nr)) {
 			printf("Inode %d is marked as 'unused', but it is used "
 					"for file '%s'\n", nr, current_name);
-			if (repair) {
+			if (OPT_repair) {
 				if (ask("Mark as 'in use'", 1))
 					mark_inode(nr);
-			} else {
-				errors_uncorrected = 1;
+				else
+					errors_uncorrected = 1;
 			}
 		}
-		if (S_ISDIR(inode->i_mode))
+		if (S_ISDIR(i_mode))
 			directory++;
-		else if (S_ISREG(inode->i_mode))
+		else if (S_ISREG(i_mode))
 			regular++;
-		else if (S_ISCHR(inode->i_mode))
+		else if (S_ISCHR(i_mode))
 			chardev++;
-		else if (S_ISBLK(inode->i_mode))
+		else if (S_ISBLK(i_mode))
 			blockdev++;
-		else if (S_ISLNK(inode->i_mode))
+		else if (S_ISLNK(i_mode))
 			symlinks++;
-		else if (S_ISSOCK(inode->i_mode));
-		else if (S_ISFIFO(inode->i_mode));
+		else if (S_ISSOCK(i_mode));
+		else if (S_ISFIFO(i_mode));
 		else {
-			printf("%s has mode %05o\n", current_name, inode->i_mode);
+			printf("%s has mode %05o\n", current_name, i_mode);
 		}
-
 	} else
 		links++;
 	if (!++inode_count[nr]) {
@@ -679,6 +715,16 @@
 		inode_count[nr]--;
 		errors_uncorrected = 1;
 	}
+}
+
+static struct minix1_inode *get_inode(unsigned nr)
+{
+	struct minix1_inode *inode;
+
+	if (!nr || nr > INODES)
+		return NULL;
+	inode = Inode1 + nr;
+	get_inode_common(nr, inode->i_mode);
 	return inode;
 }
 
@@ -689,41 +735,8 @@
 
 	if (!nr || nr > INODES)
 		return NULL;
-	total++;
 	inode = Inode2 + nr;
-	if (!inode_count[nr]) {
-		if (!inode_in_use(nr)) {
-			printf("Inode %d is marked as 'unused', but it is used "
-					"for file '%s'\n", nr, current_name);
-			if (repair) {
-				if (ask("Mark as 'in use'", 1))
-					mark_inode(nr);
-				else
-					errors_uncorrected = 1;
-			}
-		}
-		if (S_ISDIR(inode->i_mode))
-			directory++;
-		else if (S_ISREG(inode->i_mode))
-			regular++;
-		else if (S_ISCHR(inode->i_mode))
-			chardev++;
-		else if (S_ISBLK(inode->i_mode))
-			blockdev++;
-		else if (S_ISLNK(inode->i_mode))
-			symlinks++;
-		else if (S_ISSOCK(inode->i_mode));
-		else if (S_ISFIFO(inode->i_mode));
-		else {
-			printf("%s has mode %05o\n", current_name, inode->i_mode);
-		}
-	} else
-		links++;
-	if (!++inode_count[nr]) {
-		printf("Warning: inode count too big\n");
-		inode_count[nr]--;
-		errors_uncorrected = 1;
-	}
+	get_inode_common(nr, inode->i_mode);
 	return inode;
 }
 #endif
@@ -748,23 +761,17 @@
 void check_root2(void);
 #endif
 
-static int add_zone(uint16_t *znr, smallint *corrected)
+static int add_zone_common(int block, smallint *corrected)
 {
-	int result;
-	int block;
-
-	result = 0;
-	block = check_zone_nr(znr, corrected);
 	if (!block)
 		return 0;
 	if (zone_count[block]) {
 		printf("Already used block is reused in file '%s'. ",
 				current_name);
 		if (ask("Clear", 1)) {
-			*znr = 0;
 			block = 0;
 			*corrected = 1;
-			return 0;
+			return -1; /* "please zero out *znr" */
 		}
 	}
 	if (!zone_in_use(block)) {
@@ -778,41 +785,36 @@
 	return block;
 }
 
+static int add_zone(uint16_t *znr, smallint *corrected)
+{
+	int block;
+
+	block = check_zone_nr(znr, corrected);
+	block = add_zone_common(block, corrected);
+	if (block == -1) {
+		*znr = 0;
+		block = 0;
+	}
+	return block;
+}
+
 #if ENABLE_FEATURE_MINIX2
 static int add_zone2(uint32_t *znr, smallint *corrected)
 {
-	int result;
 	int block;
 
-	result = 0;
 	block = check_zone_nr2(znr, corrected);
-	if (!block)
-		return 0;
-	if (zone_count[block]) {
-		printf("Already used block is reused in file '%s'. ",
-				current_name);
-		if (ask("Clear", 1)) {
-			*znr = 0;
-			block = 0;
-			*corrected = 1;
-			return 0;
-		}
-	}
-	if (!zone_in_use(block)) {
-		printf("Block %d in file '%s' is marked as 'unused'. ",
-				block, current_name);
-		if (ask("Correct", 1))
-			mark_zone(block);
+	block = add_zone_common(block, corrected);
+	if (block == -1) {
+		*znr = 0;
+		block = 0;
 	}
-	if (!++zone_count[block])
-		zone_count[block]--;
 	return block;
 }
 #endif
 
 static void add_zone_ind(uint16_t *znr, smallint *corrected)
 {
-	static char blk[BLOCK_SIZE];
 	int i;
 	int block;
 	smallint chg_blk = 0;
@@ -820,17 +822,16 @@
 	block = add_zone(znr, corrected);
 	if (!block)
 		return;
-	read_block(block, blk);
+	read_block(block, add_zone_ind_blk);
 	for (i = 0; i < (BLOCK_SIZE >> 1); i++)
-		add_zone(i + (uint16_t *) blk, &chg_blk);
+		add_zone(i + (uint16_t *) add_zone_ind_blk, &chg_blk);
 	if (chg_blk)
-		write_block(block, blk);
+		write_block(block, add_zone_ind_blk);
 }
 
 #if ENABLE_FEATURE_MINIX2
 static void add_zone_ind2(uint32_t *znr, smallint *corrected)
 {
-	static char blk[BLOCK_SIZE];
 	int i;
 	int block;
 	smallint chg_blk = 0;
@@ -838,17 +839,16 @@
 	block = add_zone2(znr, corrected);
 	if (!block)
 		return;
-	read_block(block, blk);
+	read_block(block, add_zone_ind_blk);
 	for (i = 0; i < BLOCK_SIZE >> 2; i++)
-		add_zone2(i + (uint32_t *) blk, &chg_blk);
+		add_zone2(i + (uint32_t *) add_zone_ind_blk, &chg_blk);
 	if (chg_blk)
-		write_block(block, blk);
+		write_block(block, add_zone_ind_blk);
 }
 #endif
 
 static void add_zone_dind(uint16_t *znr, smallint *corrected)
 {
-	static char blk[BLOCK_SIZE];
 	int i;
 	int block;
 	smallint chg_blk = 0;
@@ -856,17 +856,16 @@
 	block = add_zone(znr, corrected);
 	if (!block)
 		return;
-	read_block(block, blk);
+	read_block(block, add_zone_dind_blk);
 	for (i = 0; i < (BLOCK_SIZE >> 1); i++)
-		add_zone_ind(i + (uint16_t *) blk, &chg_blk);
+		add_zone_ind(i + (uint16_t *) add_zone_dind_blk, &chg_blk);
 	if (chg_blk)
-		write_block(block, blk);
+		write_block(block, add_zone_dind_blk);
 }
 
 #if ENABLE_FEATURE_MINIX2
 static void add_zone_dind2(uint32_t *znr, smallint *corrected)
 {
-	static char blk[BLOCK_SIZE];
 	int i;
 	int block;
 	smallint chg_blk = 0;
@@ -874,16 +873,15 @@
 	block = add_zone2(znr, corrected);
 	if (!block)
 		return;
-	read_block(block, blk);
+	read_block(block, add_zone_dind_blk);
 	for (i = 0; i < BLOCK_SIZE >> 2; i++)
-		add_zone_ind2(i + (uint32_t *) blk, &chg_blk);
+		add_zone_ind2(i + (uint32_t *) add_zone_dind_blk, &chg_blk);
 	if (chg_blk)
-		write_block(block, blk);
+		write_block(block, add_zone_dind_blk);
 }
 
 static void add_zone_tind2(uint32_t *znr, smallint *corrected)
 {
-	static char blk[BLOCK_SIZE];
 	int i;
 	int block;
 	smallint chg_blk = 0;
@@ -891,11 +889,11 @@
 	block = add_zone2(znr, corrected);
 	if (!block)
 		return;
-	read_block(block, blk);
+	read_block(block, add_zone_tind_blk);
 	for (i = 0; i < BLOCK_SIZE >> 2; i++)
-		add_zone_dind2(i + (uint32_t *) blk, &chg_blk);
+		add_zone_dind2(i + (uint32_t *) add_zone_tind_blk, &chg_blk);
 	if (chg_blk)
-		write_block(block, blk);
+		write_block(block, add_zone_tind_blk);
 }
 #endif
 
@@ -939,22 +937,21 @@
 
 static void check_file(struct minix1_inode *dir, unsigned offset)
 {
-	static char blk[BLOCK_SIZE];
 	struct minix1_inode *inode;
 	int ino;
 	char *name;
 	int block;
 
 	block = map_block(dir, offset / BLOCK_SIZE);
-	read_block(block, blk);
-	name = blk + (offset % BLOCK_SIZE) + 2;
+	read_block(block, check_file_blk);
+	name = check_file_blk + (offset % BLOCK_SIZE) + 2;
 	ino = *(uint16_t *) (name - 2);
 	if (ino > INODES) {
 		printf("%s contains a bad inode number for file '%.*s'. ",
 				current_name, namelen, name);
 		if (ask("Remove", 1)) {
 			*(uint16_t *) (name - 2) = 0;
-			write_block(block, blk);
+			write_block(block, check_file_blk);
 		}
 		ino = 0;
 	}
@@ -976,8 +973,8 @@
 	if (!inode)
 		return;
 	push_filename(name);
-	if (list) {
-		if (verbose)
+	if (OPT_list) {
+		if (OPT_verbose)
 			printf("%6d %07o %3d ", ino, inode->i_mode, inode->i_nlinks);
 		printf("%s%s\n", current_name, S_ISDIR(inode->i_mode) ? ":" : "");
 	}
@@ -990,22 +987,21 @@
 #if ENABLE_FEATURE_MINIX2
 static void check_file2(struct minix2_inode *dir, unsigned offset)
 {
-	static char blk[BLOCK_SIZE];
 	struct minix2_inode *inode;
 	int ino;
 	char *name;
 	int block;
 
 	block = map_block2(dir, offset / BLOCK_SIZE);
-	read_block(block, blk);
-	name = blk + (offset % BLOCK_SIZE) + 2;
+	read_block(block, check_file_blk);
+	name = check_file_blk + (offset % BLOCK_SIZE) + 2;
 	ino = *(uint16_t *) (name - 2);
 	if (ino > INODES) {
 		printf("%s contains a bad inode number for file '%.*s'. ",
 				current_name, namelen, name);
 		if (ask("Remove", 1)) {
 			*(uint16_t *) (name - 2) = 0;
-			write_block(block, blk);
+			write_block(block, check_file_blk);
 		}
 		ino = 0;
 	}
@@ -1027,8 +1023,8 @@
 	if (!inode)
 		return;
 	push_filename(name);
-	if (list) {
-		if (verbose)
+	if (OPT_list) {
+		if (OPT_verbose)
 			printf("%6d %07o %3d ", ino, inode->i_mode, inode->i_nlinks);
 		printf("%s%s\n", current_name, S_ISDIR(inode->i_mode) ? ":" : "");
 	}
@@ -1077,9 +1073,8 @@
 {
 	char buffer[BLOCK_SIZE];
 
-	if (BLOCK_SIZE * i != lseek(IN, BLOCK_SIZE * i, SEEK_SET))
-		die("seek failed in bad_zone");
-	return (BLOCK_SIZE != read(IN, buffer, BLOCK_SIZE));
+	xlseek(dev_fd, BLOCK_SIZE * i, SEEK_SET);
+	return (BLOCK_SIZE != full_read(dev_fd, buffer, BLOCK_SIZE));
 }
 
 static void check_counts(void)
@@ -1087,7 +1082,7 @@
 	int i;
 
 	for (i = 1; i <= INODES; i++) {
-		if (warn_mode && Inode1[i].i_mode && !inode_in_use(i)) {
+		if (OPT_warn_mode && Inode1[i].i_mode && !inode_in_use(i)) {
 			printf("Inode %d has non-zero mode. ", i);
 			if (ask("Clear", 1)) {
 				Inode1[i].i_mode = 0;
@@ -1109,7 +1104,8 @@
 		}
 		if (Inode1[i].i_nlinks != inode_count[i]) {
 			printf("Inode %d (mode=%07o), i_nlinks=%d, counted=%d. ",
-				   i, Inode1[i].i_mode, Inode1[i].i_nlinks, inode_count[i]);
+				i, Inode1[i].i_mode, Inode1[i].i_nlinks,
+				inode_count[i]);
 			if (ask("Set i_nlinks to count", 1)) {
 				Inode1[i].i_nlinks = inode_count[i];
 				changed = 1;
@@ -1117,7 +1113,7 @@
 		}
 	}
 	for (i = FIRSTZONE; i < ZONES; i++) {
-		if (zone_in_use(i) == zone_count[i])
+		if ((zone_in_use(i) != 0) == zone_count[i])
 			continue;
 		if (!zone_count[i]) {
 			if (bad_zone(i))
@@ -1138,7 +1134,7 @@
 	int i;
 
 	for (i = 1; i <= INODES; i++) {
-		if (warn_mode && Inode2[i].i_mode && !inode_in_use(i)) {
+		if (OPT_warn_mode && Inode2[i].i_mode && !inode_in_use(i)) {
 			printf("Inode %d has non-zero mode. ", i);
 			if (ask("Clear", 1)) {
 				Inode2[i].i_mode = 0;
@@ -1160,8 +1156,8 @@
 		}
 		if (Inode2[i].i_nlinks != inode_count[i]) {
 			printf("Inode %d (mode=%07o), i_nlinks=%d, counted=%d. ",
-				   i, Inode2[i].i_mode, Inode2[i].i_nlinks,
-				   inode_count[i]);
+				i, Inode2[i].i_mode, Inode2[i].i_nlinks,
+				inode_count[i]);
 			if (ask("Set i_nlinks to count", 1)) {
 				Inode2[i].i_nlinks = inode_count[i];
 				changed = 1;
@@ -1169,7 +1165,7 @@
 		}
 	}
 	for (i = FIRSTZONE; i < ZONES; i++) {
-		if (zone_in_use(i) == zone_count[i])
+		if ((zone_in_use(i) != 0) == zone_count[i])
 			continue;
 		if (!zone_count[i]) {
 			if (bad_zone(i))
@@ -1207,73 +1203,27 @@
 void check2(void);
 #endif
 
-int fsck_minix_main(int argc, char **argv)
+int fsck_minix_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int fsck_minix_main(int argc UNUSED_PARAM, char **argv)
 {
 	struct termios tmp;
 	int retcode = 0;
 
 	xfunc_error_retval = 8;
 
-	alloc_current_name();
-#if ENABLE_FEATURE_CLEAN_UP
-	/* Don't bother to free memory.  Exit does
-	 * that automagically, so we can save a few bytes */
-	atexit(free_current_name);
-#endif
+	INIT_G();
 
-	if (INODE_SIZE1 * MINIX1_INODES_PER_BLOCK != BLOCK_SIZE)
-		die("bad inode size");
-#if ENABLE_FEATURE_MINIX2
-	if (INODE_SIZE2 * MINIX2_INODES_PER_BLOCK != BLOCK_SIZE)
-		die("bad v2 inode size");
-#endif
-	while (--argc != 0) {
-		argv++;
-		if (argv[0][0] != '-') {
-			if (device_name)
-				bb_show_usage();
-			device_name = argv[0];
-		} else {
-			while (*++argv[0]) {
-				switch (argv[0][0]) {
-				case 'l':
-					list = 1;
-					break;
-				case 'a':
-					automatic = 1;
-					repair = 1;
-					break;
-				case 'r':
-					automatic = 0;
-					repair = 1;
-					break;
-				case 'v':
-					verbose = 1;
-					break;
-				case 's':
-					show = 1;
-					break;
-				case 'm':
-					warn_mode = 1;
-					break;
-				case 'f':
-					force = 1;
-					break;
-				default:
-					bb_show_usage();
-				}
-			}
-		}
-	}
-	if (!device_name)
-		bb_show_usage();
+	opt_complementary = "=1:ar"; /* one argument; -a assumes -r */
+	getopt32(argv, OPTION_STR);
+	argv += optind;
+	device_name = argv[0];
 
-	check_mount();				/* trying to check a mounted filesystem? */
-	if (repair && !automatic) {
+	check_mount();  /* trying to check a mounted filesystem? */
+	if (OPT_manual) {
 		if (!isatty(0) || !isatty(1))
 			die("need terminal for interactive repairs");
 	}
-	IN = xopen(device_name, repair ? O_RDWR : O_RDONLY);
+	xmove_fd(xopen(device_name, OPT_repair ? O_RDWR : O_RDONLY), dev_fd);
 
 	/*sync(); paranoia? */
 	read_superblock();
@@ -1284,27 +1234,27 @@
 	 * flags and whether or not the -f switch was specified on the
 	 * command line.
 	 */
-	printf("%s, "PROGRAM_VERSION"\n", applet_name);
+	printf("%s: %s\n", applet_name, bb_banner);
 
 	if (!(Super.s_state & MINIX_ERROR_FS)
-	 && (Super.s_state & MINIX_VALID_FS) && !force
+	 && (Super.s_state & MINIX_VALID_FS) && !OPT_force
 	) {
-		if (repair)
+		if (OPT_repair)
 			printf("%s is clean, check is skipped\n", device_name);
 		return 0;
-	} else if (force)
+	} else if (OPT_force)
 		printf("Forcing filesystem check on %s\n", device_name);
-	else if (repair)
+	else if (OPT_repair)
 		printf("Filesystem on %s is dirty, needs checking\n",
 			   device_name);
 
 	read_tables();
 
-	if (repair && !automatic) {
-		tcgetattr(0, &termios);
-		tmp = termios;
+	if (OPT_manual) {
+		tcgetattr(0, &sv_termios);
+		tmp = sv_termios;
 		tmp.c_lflag &= ~(ICANON | ECHO);
-		tcsetattr(0, TCSANOW, &tmp);
+		tcsetattr_stdin_TCSANOW(&tmp);
 		termios_set = 1;
 	}
 
@@ -1316,7 +1266,7 @@
 		check();
 	}
 
-	if (verbose) {
+	if (OPT_verbose) {
 		int i, free_cnt;
 
 		for (i = 1, free_cnt = 0; i <= INODES; i++)
@@ -1345,11 +1295,11 @@
 		write_tables();
 		printf("FILE SYSTEM HAS BEEN CHANGED\n");
 		sync();
-	} else if (repair)
-		write_super_block();
+	} else if (OPT_repair)
+		write_superblock();
 
-	if (repair && !automatic)
-		tcsetattr(0, TCSANOW, &termios);
+	if (OPT_manual)
+		tcsetattr_stdin_TCSANOW(&sv_termios);
 
 	if (changed)
 		retcode += 3;