X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=util-linux%2Fmkfs_minix.c;h=2666132f978e44fcdc9639f10da97a0e9fde6c8f;hb=7307e06122997f3d5e0108cd1bab4b11a1d5ebdc;hp=5cdbfead924b753a187d0b4ca7af177615209a0c;hpb=89f0b3486dfea233e6000f9af95b39a3ea7fd96e;p=oweals%2Fbusybox.git

diff --git a/util-linux/mkfs_minix.c b/util-linux/mkfs_minix.c
index 5cdbfead9..2666132f9 100644
--- a/util-linux/mkfs_minix.c
+++ b/util-linux/mkfs_minix.c
@@ -2,8 +2,9 @@
 /*
  * mkfs.c - make a linux (minix) file-system.
  *
- * (C) 1991 Linus Torvalds. This file may be redistributed as per
- * the Linux copyright.
+ * (C) 1991 Linus Torvalds.
+ *
+ * Licensed under GPLv2, see file LICENSE in this tarball for details.
  */
 
 /*
@@ -33,8 +34,8 @@
  * 03.01.94  -	Added support for file system valid flag.
  *		(Dr. Wettstein, greg%wind.uucp@plains.nodak.edu)
  *
- * 30.10.94 - added support for v2 filesystem
- *	      (Andreas Schwab, schwab@issan.informatik.uni-dortmund.de)
+ * 30.10.94  -  added support for v2 filesystem
+ *	        (Andreas Schwab, schwab@issan.informatik.uni-dortmund.de)
  *
  * 09.11.94  -	Added test to prevent overwrite of mounted fs adapted
  *		from Theodore Ts'o's (tytso@athena.mit.edu) mke2fs
@@ -62,206 +63,135 @@
  *	removed getopt based parser and added a hand rolled one.
  */
 
-#include "busybox.h"
+#include "libbb.h"
 #include <mntent.h>
 
-#define MINIX_ROOT_INO 1
-#define MINIX_LINK_MAX	250
-#define MINIX2_LINK_MAX	65530
-
-#define MINIX_I_MAP_SLOTS	8
-#define MINIX_Z_MAP_SLOTS	64
-#define MINIX_SUPER_MAGIC	0x137F		/* original minix fs */
-#define MINIX_SUPER_MAGIC2	0x138F		/* minix fs, 30 char names */
-#define MINIX2_SUPER_MAGIC	0x2468		/* minix V2 fs */
-#define MINIX2_SUPER_MAGIC2	0x2478		/* minix V2 fs, 30 char names */
-#define MINIX_VALID_FS		0x0001		/* Clean fs. */
-#define MINIX_ERROR_FS		0x0002		/* fs has errors. */
-
-#define MINIX_INODES_PER_BLOCK ((BLOCK_SIZE)/(sizeof (struct minix_inode)))
-#define MINIX2_INODES_PER_BLOCK ((BLOCK_SIZE)/(sizeof (struct minix2_inode)))
-
-#define MINIX_V1		0x0001		/* original minix fs */
-#define MINIX_V2		0x0002		/* minix V2 fs */
-
-#define INODE_VERSION(inode)	inode->i_sb->u.minix_sb.s_version
-
-/*
- * This is the original minix inode layout on disk.
- * Note the 8-bit gid and atime and ctime.
- */
-struct minix_inode {
-	uint16_t i_mode;
-	uint16_t i_uid;
-	uint32_t i_size;
-	uint32_t i_time;
-	uint8_t  i_gid;
-	uint8_t  i_nlinks;
-	uint16_t i_zone[9];
-};
-
-/*
- * The new minix inode has all the time entries, as well as
- * long block numbers and a third indirect block (7+1+1+1
- * instead of 7+1+1). Also, some previously 8-bit values are
- * now 16-bit. The inode is now 64 bytes instead of 32.
- */
-struct minix2_inode {
-	uint16_t i_mode;
-	uint16_t i_nlinks;
-	uint16_t i_uid;
-	uint16_t i_gid;
-	uint32_t i_size;
-	uint32_t i_atime;
-	uint32_t i_mtime;
-	uint32_t i_ctime;
-	uint32_t i_zone[10];
-};
+#include "minix.h"
 
-/*
- * minix super-block data on disk
- */
-struct minix_super_block {
-	uint16_t s_ninodes;
-	uint16_t s_nzones;
-	uint16_t s_imap_blocks;
-	uint16_t s_zmap_blocks;
-	uint16_t s_firstdatazone;
-	uint16_t s_log_zone_size;
-	uint32_t s_max_size;
-	uint16_t s_magic;
-	uint16_t s_state;
-	uint32_t s_zones;
-};
+/* Store the very same times/uids/gids for image consistency */
+#if 1
+# define CUR_TIME 0
+# define GETUID 0
+# define GETGID 0
+#else
+/* Was using this. Is it useful? NB: this will break testsuite */
+# define CUR_TIME time(NULL)
+# define GETUID getuid()
+# define GETGID getgid()
+#endif
 
-struct minix_dir_entry {
-	uint16_t inode;
-	char name[0];
+enum {
+	MAX_GOOD_BLOCKS         = 512,
+	TEST_BUFFER_BLOCKS      = 16,
 };
 
-#define NAME_MAX         255   /* # chars in a file name */
-
-#define MINIX_INODES_PER_BLOCK ((BLOCK_SIZE)/(sizeof (struct minix_inode)))
-
-#define MINIX_VALID_FS               0x0001          /* Clean fs. */
-#define MINIX_ERROR_FS               0x0002          /* fs has errors. */
+#if !ENABLE_FEATURE_MINIX2
+enum { version2 = 0 };
+#endif
 
-#define MINIX_SUPER_MAGIC    0x137F          /* original minix fs */
-#define MINIX_SUPER_MAGIC2   0x138F          /* minix fs, 30 char names */
+enum { dev_fd = 3 };
 
-#ifndef BLKGETSIZE
-#define BLKGETSIZE _IO(0x12,96)    /* return device size */
+struct globals {
+#if ENABLE_FEATURE_MINIX2
+	smallint version2;
+#define version2 G.version2
 #endif
+	char *device_name;
+	uint32_t total_blocks;
+	int badblocks;
+	int namelen;
+	int dirsize;
+	int magic;
+	char *inode_buffer;
+	char *inode_map;
+	char *zone_map;
+	int used_good_blocks;
+	unsigned long req_nr_inodes;
+	unsigned currently_testing;
+
+	char root_block[BLOCK_SIZE];
+	char superblock_buffer[BLOCK_SIZE];
+	char boot_block_buffer[512];
+	unsigned short good_blocks_table[MAX_GOOD_BLOCKS];
+	/* check_blocks(): buffer[] was the biggest static in entire bbox */
+	char check_blocks_buffer[BLOCK_SIZE * TEST_BUFFER_BLOCKS];
+
+	unsigned short ind_block1[BLOCK_SIZE >> 1];
+	unsigned short dind_block1[BLOCK_SIZE >> 1];
+	unsigned long ind_block2[BLOCK_SIZE >> 2];
+	unsigned long dind_block2[BLOCK_SIZE >> 2];
+};
+#define G (*ptr_to_globals)
+#define INIT_G() do { \
+	SET_PTR_TO_GLOBALS(xzalloc(sizeof(G))); \
+} while (0)
 
+static ALWAYS_INLINE unsigned div_roundup(unsigned size, unsigned n)
+{
+	return (size + n-1) / n;
+}
 
-#ifndef __linux__
-#define volatile
-#endif
+#define INODE_BUF1              (((struct minix1_inode*)G.inode_buffer) - 1)
+#define INODE_BUF2              (((struct minix2_inode*)G.inode_buffer) - 1)
 
-#define MINIX_ROOT_INO 1
-#define MINIX_BAD_INO 2
+#define SB                      (*(struct minix_superblock*)G.superblock_buffer)
 
-#define TEST_BUFFER_BLOCKS 16
-#define MAX_GOOD_BLOCKS 512
+#define SB_INODES               (SB.s_ninodes)
+#define SB_IMAPS                (SB.s_imap_blocks)
+#define SB_ZMAPS                (SB.s_zmap_blocks)
+#define SB_FIRSTZONE            (SB.s_firstdatazone)
+#define SB_ZONE_SIZE            (SB.s_log_zone_size)
+#define SB_MAXSIZE              (SB.s_max_size)
+#define SB_MAGIC                (SB.s_magic)
 
-#define UPPER(size,n) (((size)+((n)-1))/(n))
-#define INODE_SIZE (sizeof(struct minix_inode))
-#ifdef CONFIG_FEATURE_MINIX2
-#define INODE_SIZE2 (sizeof(struct minix2_inode))
-#define INODE_BLOCKS UPPER(INODES, (version2 ? MINIX2_INODES_PER_BLOCK \
-				    : MINIX_INODES_PER_BLOCK))
+#if !ENABLE_FEATURE_MINIX2
+# define SB_ZONES               (SB.s_nzones)
+# define INODE_BLOCKS           div_roundup(SB_INODES, MINIX1_INODES_PER_BLOCK)
 #else
-#define INODE_BLOCKS UPPER(INODES, (MINIX_INODES_PER_BLOCK))
+# define SB_ZONES               (version2 ? SB.s_zones : SB.s_nzones)
+# define INODE_BLOCKS           div_roundup(SB_INODES, \
+                                (version2 ? MINIX2_INODES_PER_BLOCK : MINIX1_INODES_PER_BLOCK))
 #endif
-#define INODE_BUFFER_SIZE (INODE_BLOCKS * BLOCK_SIZE)
-
-#define BITS_PER_BLOCK (BLOCK_SIZE<<3)
-
-static char *device_name;
-static int DEV = -1;
-static uint32_t BLOCKS;
-static int check;
-static int badblocks;
-static int namelen = 30;		/* default (changed to 30, per Linus's
 
-								   suggestion, Sun Nov 21 08:05:07 1993) */
-static int dirsize = 32;
-static int magic = MINIX_SUPER_MAGIC2;
-static int version2;
+#define INODE_BUFFER_SIZE       (INODE_BLOCKS * BLOCK_SIZE)
+#define NORM_FIRSTZONE          (2 + SB_IMAPS + SB_ZMAPS + INODE_BLOCKS)
 
-static char root_block[BLOCK_SIZE];
+/* Before you ask "where they come from?": */
+/* setbit/clrbit are supplied by sys/param.h */
 
-static char *inode_buffer;
-
-#define Inode (((struct minix_inode *) inode_buffer)-1)
-#ifdef CONFIG_FEATURE_MINIX2
-#define Inode2 (((struct minix2_inode *) inode_buffer)-1)
-#endif
-static char super_block_buffer[BLOCK_SIZE];
-static char boot_block_buffer[512];
-
-#define Super (*(struct minix_super_block *)super_block_buffer)
-#define INODES (Super.s_ninodes)
-#ifdef CONFIG_FEATURE_MINIX2
-#define ZONES (version2 ? Super.s_zones : Super.s_nzones)
-#else
-#define ZONES (Super.s_nzones)
-#endif
-#define IMAPS (Super.s_imap_blocks)
-#define ZMAPS (Super.s_zmap_blocks)
-#define FIRSTZONE (Super.s_firstdatazone)
-#define ZONESIZE (Super.s_log_zone_size)
-#define MAXSIZE (Super.s_max_size)
-#define MAGIC (Super.s_magic)
-#define NORM_FIRSTZONE (2+IMAPS+ZMAPS+INODE_BLOCKS)
-
-static char *inode_map;
-static char *zone_map;
-
-static unsigned short good_blocks_table[MAX_GOOD_BLOCKS];
-static int used_good_blocks;
-static unsigned long req_nr_inodes;
-
-static int bit(char * a,unsigned int i)
+static int minix_bit(const char* a, unsigned i)
 {
-	  return (a[i >> 3] & (1<<(i & 7))) != 0;
+	return a[i >> 3] & (1<<(i & 7));
 }
-#define inode_in_use(x) (bit(inode_map,(x)))
-#define zone_in_use(x) (bit(zone_map,(x)-FIRSTZONE+1))
 
-#define mark_inode(x) (setbit(inode_map,(x)))
-#define unmark_inode(x) (clrbit(inode_map,(x)))
+static void minix_setbit(char *a, unsigned i)
+{
+	setbit(a, i);
+}
+static void minix_clrbit(char *a, unsigned i)
+{
+	clrbit(a, i);
+}
 
-#define mark_zone(x) (setbit(zone_map,(x)-FIRSTZONE+1))
-#define unmark_zone(x) (clrbit(zone_map,(x)-FIRSTZONE+1))
+/* Note: do not assume 0/1, it is 0/nonzero */
+#define zone_in_use(x)  minix_bit(G.zone_map,(x)-SB_FIRSTZONE+1)
+/*#define inode_in_use(x) minix_bit(G.inode_map,(x))*/
 
-/*
- * Check to make certain that our new filesystem won't be created on
- * an already mounted partition.  Code adapted from mke2fs, Copyright
- * (C) 1994 Theodore Ts'o.  Also licensed under GPL.
- */
-static void check_mount(void)
-{
-	FILE *f;
-	struct mntent *mnt;
+#define mark_inode(x)   minix_setbit(G.inode_map,(x))
+#define unmark_inode(x) minix_clrbit(G.inode_map,(x))
+#define mark_zone(x)    minix_setbit(G.zone_map,(x)-SB_FIRSTZONE+1)
+#define unmark_zone(x)  minix_clrbit(G.zone_map,(x)-SB_FIRSTZONE+1)
 
-	if ((f = setmntent(MOUNTED, "r")) == NULL)
-		return;
-	while ((mnt = getmntent(f)) != NULL)
-		if (strcmp(device_name, mnt->mnt_fsname) == 0)
-			break;
-	endmntent(f);
-	if (!mnt)
-		return;
+#ifndef BLKGETSIZE
+# define BLKGETSIZE     _IO(0x12,96)    /* return device size */
+#endif
 
-	bb_error_msg_and_die("%s is mounted; will not make a filesystem here!", device_name);
-}
 
 static long valid_offset(int fd, int offset)
 {
 	char ch;
 
-	if (lseek(fd, offset, 0) < 0)
+	if (lseek(fd, offset, SEEK_SET) < 0)
 		return 0;
 	if (read(fd, &ch, 1) < 1)
 		return 0;
@@ -275,6 +205,7 @@ static int count_blocks(int fd)
 	low = 0;
 	for (high = 1; valid_offset(fd, high); high *= 2)
 		low = high;
+
 	while (low < high - 1) {
 		const int mid = (low + high) / 2;
 
@@ -305,51 +236,56 @@ static int get_size(const char *file)
 
 static void write_tables(void)
 {
-	/* Mark the super block valid. */
-	Super.s_state |= MINIX_VALID_FS;
-	Super.s_state &= ~MINIX_ERROR_FS;
-
-	if (lseek(DEV, 0, SEEK_SET))
-		bb_error_msg_and_die("seek to boot block failed in write_tables");
-	if (512 != write(DEV, boot_block_buffer, 512))
-		bb_error_msg_and_die("cannot clear boot sector");
-	if (BLOCK_SIZE != lseek(DEV, BLOCK_SIZE, SEEK_SET))
-		bb_error_msg_and_die("seek failed in write_tables");
-	if (BLOCK_SIZE != write(DEV, super_block_buffer, BLOCK_SIZE))
-		bb_error_msg_and_die("cannot write super-block");
-	if (IMAPS * BLOCK_SIZE != write(DEV, inode_map, IMAPS * BLOCK_SIZE))
-		bb_error_msg_and_die("cannot write inode map");
-	if (ZMAPS * BLOCK_SIZE != write(DEV, zone_map, ZMAPS * BLOCK_SIZE))
-		bb_error_msg_and_die("cannot write zone map");
-	if (INODE_BUFFER_SIZE != write(DEV, inode_buffer, INODE_BUFFER_SIZE))
-		bb_error_msg_and_die("cannot write inodes");
+	/* Mark the superblock valid. */
+	SB.s_state |= MINIX_VALID_FS;
+	SB.s_state &= ~MINIX_ERROR_FS;
+
+	msg_eol = "seek to 0 failed";
+	xlseek(dev_fd, 0, SEEK_SET);
+
+	msg_eol = "cannot clear boot sector";
+	xwrite(dev_fd, G.boot_block_buffer, 512);
 
+	msg_eol = "seek to BLOCK_SIZE failed";
+	xlseek(dev_fd, BLOCK_SIZE, SEEK_SET);
+
+	msg_eol = "cannot write superblock";
+	xwrite(dev_fd, G.superblock_buffer, BLOCK_SIZE);
+
+	msg_eol = "cannot write inode map";
+	xwrite(dev_fd, G.inode_map, SB_IMAPS * BLOCK_SIZE);
+
+	msg_eol = "cannot write zone map";
+	xwrite(dev_fd, G.zone_map, SB_ZMAPS * BLOCK_SIZE);
+
+	msg_eol = "cannot write inodes";
+	xwrite(dev_fd, G.inode_buffer, INODE_BUFFER_SIZE);
+
+	msg_eol = "\n";
 }
 
 static void write_block(int blk, char *buffer)
 {
-	if (blk * BLOCK_SIZE != lseek(DEV, blk * BLOCK_SIZE, SEEK_SET))
-		bb_error_msg_and_die("seek failed in write_block");
-	if (BLOCK_SIZE != write(DEV, buffer, BLOCK_SIZE))
-		bb_error_msg_and_die("write failed in write_block");
+	xlseek(dev_fd, blk * BLOCK_SIZE, SEEK_SET);
+	xwrite(dev_fd, buffer, BLOCK_SIZE);
 }
 
 static int get_free_block(void)
 {
 	int blk;
 
-	if (used_good_blocks + 1 >= MAX_GOOD_BLOCKS)
+	if (G.used_good_blocks + 1 >= MAX_GOOD_BLOCKS)
 		bb_error_msg_and_die("too many bad blocks");
-	if (used_good_blocks)
-		blk = good_blocks_table[used_good_blocks - 1] + 1;
+	if (G.used_good_blocks)
+		blk = G.good_blocks_table[G.used_good_blocks - 1] + 1;
 	else
-		blk = FIRSTZONE;
-	while (blk < ZONES && zone_in_use(blk))
+		blk = SB_FIRSTZONE;
+	while (blk < SB_ZONES && zone_in_use(blk))
 		blk++;
-	if (blk >= ZONES)
+	if (blk >= SB_ZONES)
 		bb_error_msg_and_die("not enough good blocks");
-	good_blocks_table[used_good_blocks] = blk;
-	used_good_blocks++;
+	G.good_blocks_table[G.used_good_blocks] = blk;
+	G.used_good_blocks++;
 	return blk;
 }
 
@@ -357,15 +293,15 @@ static void mark_good_blocks(void)
 {
 	int blk;
 
-	for (blk = 0; blk < used_good_blocks; blk++)
-		mark_zone(good_blocks_table[blk]);
+	for (blk = 0; blk < G.used_good_blocks; blk++)
+		mark_zone(G.good_blocks_table[blk]);
 }
 
 static int next(int zone)
 {
 	if (!zone)
-		zone = FIRSTZONE - 1;
-	while (++zone < ZONES)
+		zone = SB_FIRSTZONE - 1;
+	while (++zone < SB_ZONES)
 		if (zone_in_use(zone))
 			return zone;
 	return 0;
@@ -373,21 +309,27 @@ static int next(int zone)
 
 static void make_bad_inode(void)
 {
-	struct minix_inode *inode = &Inode[MINIX_BAD_INO];
+	struct minix1_inode *inode = &INODE_BUF1[MINIX_BAD_INO];
 	int i, j, zone;
 	int ind = 0, dind = 0;
+	/* moved to globals to reduce stack usage
 	unsigned short ind_block[BLOCK_SIZE >> 1];
 	unsigned short dind_block[BLOCK_SIZE >> 1];
+	*/
+#define ind_block (G.ind_block1)
+#define dind_block (G.dind_block1)
 
 #define NEXT_BAD (zone = next(zone))
 
-	if (!badblocks)
+	if (!G.badblocks)
 		return;
 	mark_inode(MINIX_BAD_INO);
 	inode->i_nlinks = 1;
-	inode->i_time = time(NULL);
+	/* BTW, setting this makes all images different */
+	/* it's harder to check for bugs then - diff isn't helpful :(... */
+	inode->i_time = CUR_TIME;
 	inode->i_mode = S_IFREG + 0000;
-	inode->i_size = badblocks * BLOCK_SIZE;
+	inode->i_size = G.badblocks * BLOCK_SIZE;
 	zone = next(0);
 	for (i = 0; i < 7; i++) {
 		inode->i_zone[i] = zone;
@@ -414,29 +356,35 @@ static void make_bad_inode(void)
 		}
 	}
 	bb_error_msg_and_die("too many bad blocks");
-  end_bad:
+ end_bad:
 	if (ind)
 		write_block(ind, (char *) ind_block);
 	if (dind)
 		write_block(dind, (char *) dind_block);
+#undef ind_block
+#undef dind_block
 }
 
-#ifdef CONFIG_FEATURE_MINIX2
+#if ENABLE_FEATURE_MINIX2
 static void make_bad_inode2(void)
 {
-	struct minix2_inode *inode = &Inode2[MINIX_BAD_INO];
+	struct minix2_inode *inode = &INODE_BUF2[MINIX_BAD_INO];
 	int i, j, zone;
 	int ind = 0, dind = 0;
+	/* moved to globals to reduce stack usage
 	unsigned long ind_block[BLOCK_SIZE >> 2];
 	unsigned long dind_block[BLOCK_SIZE >> 2];
+	*/
+#define ind_block (G.ind_block2)
+#define dind_block (G.dind_block2)
 
-	if (!badblocks)
+	if (!G.badblocks)
 		return;
 	mark_inode(MINIX_BAD_INO);
 	inode->i_nlinks = 1;
-	inode->i_atime = inode->i_mtime = inode->i_ctime = time(NULL);
+	inode->i_atime = inode->i_mtime = inode->i_ctime = CUR_TIME;
 	inode->i_mode = S_IFREG + 0000;
-	inode->i_size = badblocks * BLOCK_SIZE;
+	inode->i_size = G.badblocks * BLOCK_SIZE;
 	zone = next(0);
 	for (i = 0; i < 7; i++) {
 		inode->i_zone[i] = zone;
@@ -464,201 +412,128 @@ static void make_bad_inode2(void)
 	}
 	/* Could make triple indirect block here */
 	bb_error_msg_and_die("too many bad blocks");
-  end_bad:
+ end_bad:
 	if (ind)
 		write_block(ind, (char *) ind_block);
 	if (dind)
 		write_block(dind, (char *) dind_block);
+#undef ind_block
+#undef dind_block
 }
+#else
+void make_bad_inode2(void);
 #endif
 
 static void make_root_inode(void)
 {
-	struct minix_inode *inode = &Inode[MINIX_ROOT_INO];
+	struct minix1_inode *inode = &INODE_BUF1[MINIX_ROOT_INO];
 
 	mark_inode(MINIX_ROOT_INO);
 	inode->i_zone[0] = get_free_block();
 	inode->i_nlinks = 2;
-	inode->i_time = time(NULL);
-	if (badblocks)
-		inode->i_size = 3 * dirsize;
+	inode->i_time = CUR_TIME;
+	if (G.badblocks)
+		inode->i_size = 3 * G.dirsize;
 	else {
-		root_block[2 * dirsize] = '\0';
-		root_block[2 * dirsize + 1] = '\0';
-		inode->i_size = 2 * dirsize;
+		G.root_block[2 * G.dirsize] = '\0';
+		G.root_block[2 * G.dirsize + 1] = '\0';
+		inode->i_size = 2 * G.dirsize;
 	}
 	inode->i_mode = S_IFDIR + 0755;
-	inode->i_uid = getuid();
+	inode->i_uid = GETUID;
 	if (inode->i_uid)
-		inode->i_gid = getgid();
-	write_block(inode->i_zone[0], root_block);
+		inode->i_gid = GETGID;
+	write_block(inode->i_zone[0], G.root_block);
 }
 
-#ifdef CONFIG_FEATURE_MINIX2
+#if ENABLE_FEATURE_MINIX2
 static void make_root_inode2(void)
 {
-	struct minix2_inode *inode = &Inode2[MINIX_ROOT_INO];
+	struct minix2_inode *inode = &INODE_BUF2[MINIX_ROOT_INO];
 
 	mark_inode(MINIX_ROOT_INO);
 	inode->i_zone[0] = get_free_block();
 	inode->i_nlinks = 2;
-	inode->i_atime = inode->i_mtime = inode->i_ctime = time(NULL);
-	if (badblocks)
-		inode->i_size = 3 * dirsize;
+	inode->i_atime = inode->i_mtime = inode->i_ctime = CUR_TIME;
+	if (G.badblocks)
+		inode->i_size = 3 * G.dirsize;
 	else {
-		root_block[2 * dirsize] = '\0';
-		root_block[2 * dirsize + 1] = '\0';
-		inode->i_size = 2 * dirsize;
+		G.root_block[2 * G.dirsize] = '\0';
+		G.root_block[2 * G.dirsize + 1] = '\0';
+		inode->i_size = 2 * G.dirsize;
 	}
 	inode->i_mode = S_IFDIR + 0755;
-	inode->i_uid = getuid();
+	inode->i_uid = GETUID;
 	if (inode->i_uid)
-		inode->i_gid = getgid();
-	write_block(inode->i_zone[0], root_block);
+		inode->i_gid = GETGID;
+	write_block(inode->i_zone[0], G.root_block);
 }
+#else
+void make_root_inode2(void);
 #endif
 
-static void setup_tables(void)
-{
-	int i;
-	unsigned long inodes;
-
-	memset(super_block_buffer, 0, BLOCK_SIZE);
-	memset(boot_block_buffer, 0, 512);
-	MAGIC = magic;
-	ZONESIZE = 0;
-	MAXSIZE = version2 ? 0x7fffffff : (7 + 512 + 512 * 512) * 1024;
-#ifdef CONFIG_FEATURE_MINIX2
-	if (version2) {
-		Super.s_zones =  BLOCKS;
-	} else
-#endif
-		Super.s_nzones = BLOCKS;
-
-/* some magic nrs: 1 inode / 3 blocks */
-	if (req_nr_inodes == 0)
-		inodes = BLOCKS / 3;
-	else
-		inodes = req_nr_inodes;
-	/* Round up inode count to fill block size */
-#ifdef CONFIG_FEATURE_MINIX2
-	if (version2)
-		inodes = ((inodes + MINIX2_INODES_PER_BLOCK - 1) &
-				  ~(MINIX2_INODES_PER_BLOCK - 1));
-	else
-#endif
-		inodes = ((inodes + MINIX_INODES_PER_BLOCK - 1) &
-				  ~(MINIX_INODES_PER_BLOCK - 1));
-	if (inodes > 65535)
-		inodes = 65535;
-	INODES = inodes;
-	IMAPS = UPPER(INODES + 1, BITS_PER_BLOCK);
-	ZMAPS = 0;
-	i = 0;
-	while (ZMAPS !=
-		   UPPER(BLOCKS - (2 + IMAPS + ZMAPS + INODE_BLOCKS) + 1,
-				 BITS_PER_BLOCK) && i < 1000) {
-		ZMAPS =
-			UPPER(BLOCKS - (2 + IMAPS + ZMAPS + INODE_BLOCKS) + 1,
-				  BITS_PER_BLOCK);
-		i++;
-	}
-	/* Real bad hack but overwise mkfs.minix can be thrown
-	 * in infinite loop...
-	 * try:
-	 * dd if=/dev/zero of=test.fs count=10 bs=1024
-	 * /sbin/mkfs.minix -i 200 test.fs
-	 * */
-	if (i >= 999) {
-		bb_error_msg_and_die("cannot allocate buffers for maps");
-	}
-	FIRSTZONE = NORM_FIRSTZONE;
-	inode_map = xmalloc(IMAPS * BLOCK_SIZE);
-	zone_map = xmalloc(ZMAPS * BLOCK_SIZE);
-	memset(inode_map, 0xff, IMAPS * BLOCK_SIZE);
-	memset(zone_map, 0xff, ZMAPS * BLOCK_SIZE);
-	for (i = FIRSTZONE; i < ZONES; i++)
-		unmark_zone(i);
-	for (i = MINIX_ROOT_INO; i <= INODES; i++)
-		unmark_inode(i);
-	inode_buffer = xmalloc(INODE_BUFFER_SIZE);
-	memset(inode_buffer, 0, INODE_BUFFER_SIZE);
-	printf("%ld inodes\n", (long)INODES);
-	printf("%ld blocks\n", (long)ZONES);
-	printf("Firstdatazone=%ld (%ld)\n", (long)FIRSTZONE, (long)NORM_FIRSTZONE);
-	printf("Zonesize=%d\n", BLOCK_SIZE << ZONESIZE);
-	printf("Maxsize=%ld\n\n", (long)MAXSIZE);
-}
-
 /*
  * Perform a test of a block; return the number of
- * blocks readable/writable.
+ * blocks readable.
  */
-static long do_check(char *buffer, int try, unsigned int current_block)
+static size_t do_check(char *buffer, size_t try, unsigned current_block)
 {
-	long got;
+	ssize_t got;
 
 	/* Seek to the correct loc. */
-	if (lseek(DEV, current_block * BLOCK_SIZE, SEEK_SET) !=
-		current_block * BLOCK_SIZE) {
-		bb_error_msg_and_die("seek failed during testing of blocks");
-	}
-
+	msg_eol = "seek failed during testing of blocks";
+	xlseek(dev_fd, current_block * BLOCK_SIZE, SEEK_SET);
+	msg_eol = "\n";
 
 	/* Try the read */
-	got = read(DEV, buffer, try * BLOCK_SIZE);
+	got = read(dev_fd, buffer, try * BLOCK_SIZE);
 	if (got < 0)
 		got = 0;
-	if (got & (BLOCK_SIZE - 1)) {
-		printf("Weird values in do_check: probably bugs\n");
-	}
-	got /= BLOCK_SIZE;
-	return got;
-}
+	try = ((size_t)got) / BLOCK_SIZE;
 
-static unsigned int currently_testing;
+	if (got & (BLOCK_SIZE - 1))
+		fprintf(stderr, "Short read at block %u\n", (unsigned)(current_block + try));
+	return try;
+}
 
-static void alarm_intr(int alnum)
+static void alarm_intr(int alnum UNUSED_PARAM)
 {
-	if (currently_testing >= ZONES)
+	if (G.currently_testing >= SB_ZONES)
 		return;
 	signal(SIGALRM, alarm_intr);
 	alarm(5);
-	if (!currently_testing)
+	if (!G.currently_testing)
 		return;
-	printf("%d ...", currently_testing);
+	printf("%d ...", G.currently_testing);
 	fflush(stdout);
 }
 
 static void check_blocks(void)
 {
-	int try, got;
-	static char buffer[BLOCK_SIZE * TEST_BUFFER_BLOCKS];
+	size_t try, got;
 
-	currently_testing = 0;
+	G.currently_testing = 0;
 	signal(SIGALRM, alarm_intr);
 	alarm(5);
-	while (currently_testing < ZONES) {
-		if (lseek(DEV, currently_testing * BLOCK_SIZE, SEEK_SET) !=
-			currently_testing * BLOCK_SIZE)
-			bb_error_msg_and_die("seek failed in check_blocks");
+	while (G.currently_testing < SB_ZONES) {
+		msg_eol = "seek failed in check_blocks";
+		xlseek(dev_fd, G.currently_testing * BLOCK_SIZE, SEEK_SET);
+		msg_eol = "\n";
 		try = TEST_BUFFER_BLOCKS;
-		if (currently_testing + try > ZONES)
-			try = ZONES - currently_testing;
-		got = do_check(buffer, try, currently_testing);
-		currently_testing += got;
+		if (G.currently_testing + try > SB_ZONES)
+			try = SB_ZONES - G.currently_testing;
+		got = do_check(G.check_blocks_buffer, try, G.currently_testing);
+		G.currently_testing += got;
 		if (got == try)
 			continue;
-		if (currently_testing < FIRSTZONE)
+		if (G.currently_testing < SB_FIRSTZONE)
 			bb_error_msg_and_die("bad blocks before data-area: cannot make fs");
-		mark_zone(currently_testing);
-		badblocks++;
-		currently_testing++;
+		mark_zone(G.currently_testing);
+		G.badblocks++;
+		G.currently_testing++;
 	}
-	if (badblocks > 1)
-		printf("%d bad blocks\n", badblocks);
-	else if (badblocks == 1)
-		printf("one bad block\n");
+	alarm(0);
+	printf("%d bad block(s)\n", G.badblocks);
 }
 
 static void get_list_blocks(char *filename)
@@ -666,169 +541,195 @@ static void get_list_blocks(char *filename)
 	FILE *listfile;
 	unsigned long blockno;
 
-	listfile = xfopen(filename, "r");
+	listfile = xfopen_for_read(filename);
 	while (!feof(listfile)) {
 		fscanf(listfile, "%ld\n", &blockno);
 		mark_zone(blockno);
-		badblocks++;
+		G.badblocks++;
 	}
-	if (badblocks > 1)
-		printf("%d bad blocks\n", badblocks);
-	else if (badblocks == 1)
-		printf("one bad block\n");
+	printf("%d bad block(s)\n", G.badblocks);
+}
+
+static void setup_tables(void)
+{
+	unsigned long inodes;
+	unsigned norm_firstzone;
+	unsigned sb_zmaps;
+	unsigned i;
+
+	/* memset(G.superblock_buffer, 0, BLOCK_SIZE); */
+	/* memset(G.boot_block_buffer, 0, 512); */
+	SB_MAGIC = G.magic;
+	SB_ZONE_SIZE = 0;
+	SB_MAXSIZE = version2 ? 0x7fffffff : (7 + 512 + 512 * 512) * 1024;
+	if (version2)
+		SB.s_zones = G.total_blocks;
+	else
+		SB.s_nzones = G.total_blocks;
+
+	/* some magic nrs: 1 inode / 3 blocks */
+	if (G.req_nr_inodes == 0)
+		inodes = G.total_blocks / 3;
+	else
+		inodes = G.req_nr_inodes;
+	/* Round up inode count to fill block size */
+	if (version2)
+		inodes = (inodes + MINIX2_INODES_PER_BLOCK - 1) &
+		                 ~(MINIX2_INODES_PER_BLOCK - 1);
+	else
+		inodes = (inodes + MINIX1_INODES_PER_BLOCK - 1) &
+		                 ~(MINIX1_INODES_PER_BLOCK - 1);
+	if (inodes > 65535)
+		inodes = 65535;
+	SB_INODES = inodes;
+	SB_IMAPS = div_roundup(SB_INODES + 1, BITS_PER_BLOCK);
+
+	/* Real bad hack but overwise mkfs.minix can be thrown
+	 * in infinite loop...
+	 * try:
+	 * dd if=/dev/zero of=test.fs count=10 bs=1024
+	 * mkfs.minix -i 200 test.fs
+	 */
+	/* This code is not insane: NORM_FIRSTZONE is not a constant,
+	 * it is calculated from SB_INODES, SB_IMAPS and SB_ZMAPS */
+	i = 999;
+	SB_ZMAPS = 0;
+	do {
+		norm_firstzone = NORM_FIRSTZONE;
+		sb_zmaps = div_roundup(G.total_blocks - norm_firstzone + 1, BITS_PER_BLOCK);
+		if (SB_ZMAPS == sb_zmaps) goto got_it;
+		SB_ZMAPS = sb_zmaps;
+		/* new SB_ZMAPS, need to recalc NORM_FIRSTZONE */
+	} while (--i);
+	bb_error_msg_and_die("incompatible size/inode count, try different -i N");
+ got_it:
+
+	SB_FIRSTZONE = norm_firstzone;
+	G.inode_map = xmalloc(SB_IMAPS * BLOCK_SIZE);
+	G.zone_map = xmalloc(SB_ZMAPS * BLOCK_SIZE);
+	memset(G.inode_map, 0xff, SB_IMAPS * BLOCK_SIZE);
+	memset(G.zone_map, 0xff, SB_ZMAPS * BLOCK_SIZE);
+	for (i = SB_FIRSTZONE; i < SB_ZONES; i++)
+		unmark_zone(i);
+	for (i = MINIX_ROOT_INO; i <= SB_INODES; i++)
+		unmark_inode(i);
+	G.inode_buffer = xzalloc(INODE_BUFFER_SIZE);
+	printf("%ld inodes\n", (long)SB_INODES);
+	printf("%ld blocks\n", (long)SB_ZONES);
+	printf("Firstdatazone=%ld (%ld)\n", (long)SB_FIRSTZONE, (long)norm_firstzone);
+	printf("Zonesize=%d\n", BLOCK_SIZE << SB_ZONE_SIZE);
+	printf("Maxsize=%ld\n", (long)SB_MAXSIZE);
 }
 
-int mkfs_minix_main(int argc, char **argv)
+int mkfs_minix_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int mkfs_minix_main(int argc UNUSED_PARAM, char **argv)
 {
-	int i=1;
+	struct mntent *mp;
+	unsigned opt;
 	char *tmp;
 	struct stat statbuf;
+	char *str_i;
 	char *listfile = NULL;
-	int stopIt=FALSE;
 
-	if (INODE_SIZE * MINIX_INODES_PER_BLOCK != BLOCK_SIZE)
+	INIT_G();
+/* default (changed to 30, per Linus's suggestion, Sun Nov 21 08:05:07 1993) */
+	G.namelen = 30;
+	G.dirsize = 32;
+	G.magic = MINIX1_SUPER_MAGIC2;
+
+	if (INODE_SIZE1 * MINIX1_INODES_PER_BLOCK != BLOCK_SIZE)
 		bb_error_msg_and_die("bad inode size");
-#ifdef CONFIG_FEATURE_MINIX2
+#if ENABLE_FEATURE_MINIX2
 	if (INODE_SIZE2 * MINIX2_INODES_PER_BLOCK != BLOCK_SIZE)
 		bb_error_msg_and_die("bad inode size");
 #endif
 
-	/* Parse options */
-	argv++;
-	while (--argc >= 0 && *argv && **argv) {
-		if (**argv == '-') {
-			stopIt=FALSE;
-			while (i > 0 && *++(*argv) && stopIt==FALSE) {
-				switch (**argv) {
-					case 'c':
-						check = 1;
-						break;
-					case 'i':
-						{
-							char *cp=NULL;
-							if (*(*argv+1) != 0) {
-								cp = ++(*argv);
-							} else {
-								if (--argc == 0) {
-									goto goodbye;
-								}
-								cp = *(++argv);
-							}
-							req_nr_inodes = strtoul(cp, &tmp, 0);
-							if (*tmp)
-								bb_show_usage();
-							stopIt=TRUE;
-							break;
-						}
-					case 'l':
-						if (--argc == 0) {
-							goto goodbye;
-						}
-						listfile = *(++argv);
-						break;
-					case 'n':
-						{
-							char *cp=NULL;
-
-							if (*(*argv+1) != 0) {
-								cp = ++(*argv);
-							} else {
-								if (--argc == 0) {
-									goto goodbye;
-								}
-								cp = *(++argv);
-							}
-							i = strtoul(cp, &tmp, 0);
-							if (*tmp)
-								bb_show_usage();
-							if (i == 14)
-								magic = MINIX_SUPER_MAGIC;
-							else if (i == 30)
-								magic = MINIX_SUPER_MAGIC2;
-							else
-								bb_show_usage();
-							namelen = i;
-							dirsize = i + 2;
-							stopIt=TRUE;
-							break;
-						}
-					case 'v':
-#ifdef CONFIG_FEATURE_MINIX2
-						version2 = 1;
+	opt_complementary = "n+"; /* -n N */
+	opt = getopt32(argv, "ci:l:n:v", &str_i, &listfile, &G.namelen);
+	argv += optind;
+	//if (opt & 1) -c
+	if (opt & 2) G.req_nr_inodes = xatoul(str_i); // -i
+	//if (opt & 4) -l
+	if (opt & 8) { // -n
+		if (G.namelen == 14) G.magic = MINIX1_SUPER_MAGIC;
+		else if (G.namelen == 30) G.magic = MINIX1_SUPER_MAGIC2;
+		else bb_show_usage();
+		G.dirsize = G.namelen + 2;
+	}
+	if (opt & 0x10) { // -v
+#if ENABLE_FEATURE_MINIX2
+		version2 = 1;
 #else
-						bb_error_msg("%s: not compiled with minix v2 support",
-								device_name);
-						exit(-1);
+		bb_error_msg_and_die("not compiled with minix v2 support");
 #endif
-						break;
-					case '-':
-					case 'h':
-					default:
-goodbye:
-						bb_show_usage();
-				}
-			}
-		} else {
-			if (device_name == NULL)
-				device_name = *argv;
-			else if (BLOCKS == 0)
-				BLOCKS = strtol(*argv, &tmp, 0);
-			else {
-				goto goodbye;
-			}
-		}
-		argv++;
 	}
 
-	if (device_name && !BLOCKS)
-		BLOCKS = get_size(device_name) / 1024;
-	if (!device_name || BLOCKS < 10) {
+	G.device_name = *argv++;
+	if (!G.device_name)
 		bb_show_usage();
-	}
-#ifdef CONFIG_FEATURE_MINIX2
+	if (*argv)
+		G.total_blocks = xatou32(*argv);
+	else
+		G.total_blocks = get_size(G.device_name) / 1024;
+
+	if (G.total_blocks < 10)
+		bb_error_msg_and_die("must have at least 10 blocks");
+
 	if (version2) {
-		if (namelen == 14)
-			magic = MINIX2_SUPER_MAGIC;
-		else
-			magic = MINIX2_SUPER_MAGIC2;
-	} else
+		G.magic = MINIX2_SUPER_MAGIC2;
+		if (G.namelen == 14)
+			G.magic = MINIX2_SUPER_MAGIC;
+	} else if (G.total_blocks > 65535)
+		G.total_blocks = 65535;
+
+	/* Check if it is mounted */
+	mp = find_mount_point(G.device_name, NULL);
+	if (mp && strcmp(G.device_name, mp->mnt_fsname) == 0)
+		bb_error_msg_and_die("%s is mounted on %s; "
+				"refusing to make a filesystem",
+				G.device_name, mp->mnt_dir);
+
+	xmove_fd(xopen(G.device_name, O_RDWR), dev_fd);
+	if (fstat(dev_fd, &statbuf) < 0)
+		bb_error_msg_and_die("cannot stat %s", G.device_name);
+	if (!S_ISBLK(statbuf.st_mode))
+		opt &= ~1; // clear -c (check)
+
+/* I don't know why someone has special code to prevent mkfs.minix
+ * on IDE devices. Why IDE but not SCSI, etc?... */
+#if 0
+	else if (statbuf.st_rdev == 0x0300 || statbuf.st_rdev == 0x0340)
+		/* what is this? */
+		bb_error_msg_and_die("will not try "
+			"to make filesystem on '%s'", G.device_name);
 #endif
-	if (BLOCKS > 65535)
-		BLOCKS = 65535;
-	check_mount();				/* is it already mounted? */
-	tmp = root_block;
+
+	tmp = G.root_block;
 	*(short *) tmp = 1;
 	strcpy(tmp + 2, ".");
-	tmp += dirsize;
+	tmp += G.dirsize;
 	*(short *) tmp = 1;
 	strcpy(tmp + 2, "..");
-	tmp += dirsize;
+	tmp += G.dirsize;
 	*(short *) tmp = 2;
 	strcpy(tmp + 2, ".badblocks");
-	DEV = xopen(device_name, O_RDWR);
-	if (fstat(DEV, &statbuf) < 0)
-		bb_error_msg_and_die("cannot stat %s", device_name);
-	if (!S_ISBLK(statbuf.st_mode))
-		check = 0;
-	else if (statbuf.st_rdev == 0x0300 || statbuf.st_rdev == 0x0340)
-		bb_error_msg_and_die("will not try to make filesystem on '%s'", device_name);
+
 	setup_tables();
-	if (check)
+
+	if (opt & 1) // -c ?
 		check_blocks();
 	else if (listfile)
 		get_list_blocks(listfile);
-#ifdef CONFIG_FEATURE_MINIX2
+
 	if (version2) {
 		make_root_inode2();
 		make_bad_inode2();
-	} else
-#endif
-	{
+	} else {
 		make_root_inode();
 		make_bad_inode();
 	}
+
 	mark_good_blocks();
 	write_tables();
 	return 0;
-
 }