X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=mkfs_minix.c;h=fafcc230e14bdf44b269492d3d76ceae49c0ba49;hb=0cccdfaf363171c9f0761fbdb2028db0ea73e6b5;hp=7c8af7e1d978ae2a5f7594f5e66f6c1dc71c6c45;hpb=e494fdd2c73f7f2979f7e02d65e46a50bd86a59f;p=oweals%2Fbusybox.git

diff --git a/mkfs_minix.c b/mkfs_minix.c
index 7c8af7e1d..fafcc230e 100644
--- a/mkfs_minix.c
+++ b/mkfs_minix.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
  * mkfs.c - make a linux (minix) file-system.
  *
@@ -56,8 +57,12 @@
  *
  * The device may be a block device or a image of one, but this isn't
  * enforced (but it's not much fun on a character device :-). 
+ *
+ * Modified for BusyBox by Erik Andersen <andersen@debian.org> --
+ *	removed getopt based parser and added a hand rolled one.
  */
 
+#include "internal.h"
 #include <stdio.h>
 #include <time.h>
 #include <unistd.h>
@@ -67,25 +72,108 @@
 #include <ctype.h>
 #include <stdlib.h>
 #include <termios.h>
-#include <sys/stat.h>
 #include <sys/ioctl.h>
+#include <sys/param.h>
 #include <mntent.h>
-#include <getopt.h>
 
-#include <linux/fs.h>
-#include <linux/minix_fs.h>
 
-#include "nls.h"
-#include "../version.h"
+typedef unsigned char u8;
+typedef unsigned short u16;
+typedef unsigned int u32;
 
-#ifdef MINIX2_SUPER_MAGIC2
-#define HAVE_MINIX2 1
-#endif
 
-#ifndef __GNUC__
-#error "needs gcc for the bitop-__asm__'s"
+#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 {
+	u16 i_mode;
+	u16 i_uid;
+	u32 i_size;
+	u32 i_time;
+	u8  i_gid;
+	u8  i_nlinks;
+	u16 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 {
+	u16 i_mode;
+	u16 i_nlinks;
+	u16 i_uid;
+	u16 i_gid;
+	u32 i_size;
+	u32 i_atime;
+	u32 i_mtime;
+	u32 i_ctime;
+	u32 i_zone[10];
+};
+
+/*
+ * minix super-block data on disk
+ */
+struct minix_super_block {
+	u16 s_ninodes;
+	u16 s_nzones;
+	u16 s_imap_blocks;
+	u16 s_zmap_blocks;
+	u16 s_firstdatazone;
+	u16 s_log_zone_size;
+	u32 s_max_size;
+	u16 s_magic;
+	u16 s_state;
+	u32 s_zones;
+};
+
+struct minix_dir_entry {
+	u16 inode;
+	char name[0];
+};
+
+#define BLOCK_SIZE_BITS 10
+#define BLOCK_SIZE (1<<BLOCK_SIZE_BITS)
+
+#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. */
+
+#define MINIX_SUPER_MAGIC    0x137F          /* original minix fs */
+#define MINIX_SUPER_MAGIC2   0x138F          /* minix fs, 30 char names */
+
+#ifndef BLKGETSIZE
+#define BLKGETSIZE _IO(0x12,96)    /* return device size */
 #endif
 
+
 #ifndef __linux__
 #define volatile
 #endif
@@ -98,7 +186,7 @@
 
 #define UPPER(size,n) (((size)+((n)-1))/(n))
 #define INODE_SIZE (sizeof(struct minix_inode))
-#ifdef HAVE_MINIX2
+#ifdef BB_FEATURE_MINIX2
 #define INODE_SIZE2 (sizeof(struct minix2_inode))
 #define INODE_BLOCKS UPPER(INODES, (version2 ? MINIX2_INODES_PER_BLOCK \
 				    : MINIX_INODES_PER_BLOCK))
@@ -109,30 +197,32 @@
 
 #define BITS_PER_BLOCK (BLOCK_SIZE<<3)
 
-static char * program_name = "mkfs";
-static char * device_name = NULL;
+static char *device_name = NULL;
 static int DEV = -1;
 static long BLOCKS = 0;
 static int check = 0;
 static int badblocks = 0;
-static int namelen = 30;	/* default (changed to 30, per Linus's
-				   suggestion, Sun Nov 21 08:05:07 1993) */
+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 = 0;
 
 static char root_block[BLOCK_SIZE] = "\0";
 
-static char * inode_buffer = NULL;
+static char *inode_buffer = NULL;
+
 #define Inode (((struct minix_inode *) inode_buffer)-1)
-#ifdef HAVE_MINIX2
+#ifdef BB_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 ((unsigned long)Super.s_ninodes)
-#ifdef HAVE_MINIX2
+#ifdef BB_FEATURE_MINIX2
 #define ZONES ((unsigned long)(version2 ? Super.s_zones : Super.s_nzones))
 #else
 #define ZONES ((unsigned long)(Super.s_nzones))
@@ -152,8 +242,10 @@ static unsigned short good_blocks_table[MAX_GOOD_BLOCKS];
 static int used_good_blocks = 0;
 static unsigned long req_nr_inodes = 0;
 
-#include "bitops.h"
-
+static inline int bit(char * a,unsigned int i)
+{
+	  return (a[i >> 3] & (1<<(i & 7))) != 0;
+}
 #define inode_in_use(x) (bit(inode_map,(x)))
 #define zone_in_use(x) (bit(zone_map,(x)-FIRSTZONE+1))
 
@@ -168,24 +260,16 @@ static unsigned long req_nr_inodes = 0;
  * to compile this under minix, volatile gives a warning, as
  * exit() isn't defined as volatile under minix.
  */
-volatile void fatal_error(const char * fmt_string,int status)
+static volatile void die(char *str)
 {
-	fprintf(stderr,fmt_string,program_name,device_name);
-	exit(status);
-}
-
-volatile void die(char *str) {
-	fprintf(stderr, "%s: %s\n", program_name, str);
+	errorMsg("%s\n", str);
 	exit(8);
 }
 
-volatile void usage()
+static volatile void show_usage() __attribute__ ((noreturn));
+static volatile void show_usage()
 {
-	fprintf(stderr, "%s (%s)\n", program_name, util_linux_version);
-	fprintf(stderr,
-		_("Usage: %s [-c | -l filename] [-nXX] [-iXX] /dev/name [blocks]\n"),
-		  program_name);
-	exit(16);
+	usage(mkfs_minix_usage);
 }
 
 /*
@@ -195,56 +279,55 @@ volatile void usage()
  */
 static void check_mount(void)
 {
-	FILE * f;
-	struct mntent * mnt;
+	FILE *f;
+	struct mntent *mnt;
 
-	if ((f = setmntent (MOUNTED, "r")) == NULL)
+	if ((f = setmntent(MOUNTED, "r")) == NULL)
 		return;
-	while ((mnt = getmntent (f)) != NULL)
-		if (strcmp (device_name, mnt->mnt_fsname) == 0)
+	while ((mnt = getmntent(f)) != NULL)
+		if (strcmp(device_name, mnt->mnt_fsname) == 0)
 			break;
-	endmntent (f);
+	endmntent(f);
 	if (!mnt)
 		return;
 
-	die(_("%s is mounted; will not make a filesystem here!"));
+	die("%s is mounted; will not make a filesystem here!");
 }
 
-static long valid_offset (int fd, int offset)
+static long valid_offset(int fd, int offset)
 {
 	char ch;
 
-	if (lseek (fd, offset, 0) < 0)
+	if (lseek(fd, offset, 0) < 0)
 		return 0;
-	if (read (fd, &ch, 1) < 1)
+	if (read(fd, &ch, 1) < 1)
 		return 0;
 	return 1;
 }
 
-static int count_blocks (int fd)
+static int count_blocks(int fd)
 {
 	int high, low;
 
 	low = 0;
-	for (high = 1; valid_offset (fd, high); high *= 2)
+	for (high = 1; valid_offset(fd, high); high *= 2)
 		low = high;
-	while (low < high - 1)
-	{
+	while (low < high - 1) {
 		const int mid = (low + high) / 2;
 
-		if (valid_offset (fd, mid))
+		if (valid_offset(fd, mid))
 			low = mid;
 		else
 			high = mid;
 	}
-	valid_offset (fd, 0);
+	valid_offset(fd, 0);
 	return (low + 1);
 }
 
-static int get_size(const char  *file)
+static int get_size(const char *file)
 {
-	int	fd;
-	long	size;
+	int fd;
+	long size;
 
 	fd = open(file, O_RDWR);
 	if (fd < 0) {
@@ -255,87 +338,87 @@ static int get_size(const char  *file)
 		close(fd);
 		return (size * 512);
 	}
-		
+
 	size = count_blocks(fd);
 	close(fd);
 	return size;
 }
 
-void write_tables(void)
+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))
-		die(_("seek to boot block failed in write_tables"));
+		die("seek to boot block failed in write_tables");
 	if (512 != write(DEV, boot_block_buffer, 512))
-		die(_("unable to clear boot sector"));
+		die("unable to clear boot sector");
 	if (BLOCK_SIZE != lseek(DEV, BLOCK_SIZE, SEEK_SET))
-		die(_("seek failed in write_tables"));
+		die("seek failed in write_tables");
 	if (BLOCK_SIZE != write(DEV, super_block_buffer, BLOCK_SIZE))
-		die(_("unable to write super-block"));
-	if (IMAPS*BLOCK_SIZE != write(DEV,inode_map,IMAPS*BLOCK_SIZE))
-		die(_("unable to write inode map"));
-	if (ZMAPS*BLOCK_SIZE != write(DEV,zone_map,ZMAPS*BLOCK_SIZE))
-		die(_("unable to write zone map"));
-	if (INODE_BUFFER_SIZE != write(DEV,inode_buffer,INODE_BUFFER_SIZE))
-		die(_("unable to write inodes"));
-	
+		die("unable to write super-block");
+	if (IMAPS * BLOCK_SIZE != write(DEV, inode_map, IMAPS * BLOCK_SIZE))
+		die("unable to write inode map");
+	if (ZMAPS * BLOCK_SIZE != write(DEV, zone_map, ZMAPS * BLOCK_SIZE))
+		die("unable to write zone map");
+	if (INODE_BUFFER_SIZE != write(DEV, inode_buffer, INODE_BUFFER_SIZE))
+		die("unable to write inodes");
+
 }
 
-void write_block(int blk, char * buffer)
+static void write_block(int blk, char *buffer)
 {
-	if (blk*BLOCK_SIZE != lseek(DEV, blk*BLOCK_SIZE, SEEK_SET))
-		die(_("seek failed in write_block"));
+	if (blk * BLOCK_SIZE != lseek(DEV, blk * BLOCK_SIZE, SEEK_SET))
+		die("seek failed in write_block");
 	if (BLOCK_SIZE != write(DEV, buffer, BLOCK_SIZE))
-		die(_("write failed in write_block"));
+		die("write failed in write_block");
 }
 
-int get_free_block(void)
+static int get_free_block(void)
 {
 	int blk;
 
-	if (used_good_blocks+1 >= MAX_GOOD_BLOCKS)
-		die(_("too many bad blocks"));
+	if (used_good_blocks + 1 >= MAX_GOOD_BLOCKS)
+		die("too many bad blocks");
 	if (used_good_blocks)
-		blk = good_blocks_table[used_good_blocks-1]+1;
+		blk = good_blocks_table[used_good_blocks - 1] + 1;
 	else
 		blk = FIRSTZONE;
 	while (blk < ZONES && zone_in_use(blk))
 		blk++;
 	if (blk >= ZONES)
-		die(_("not enough good blocks"));
+		die("not enough good blocks");
 	good_blocks_table[used_good_blocks] = blk;
 	used_good_blocks++;
 	return blk;
 }
 
-void mark_good_blocks(void)
+static void mark_good_blocks(void)
 {
 	int blk;
 
-	for (blk=0 ; blk < used_good_blocks ; blk++)
+	for (blk = 0; blk < used_good_blocks; blk++)
 		mark_zone(good_blocks_table[blk]);
 }
 
 inline int next(int zone)
 {
 	if (!zone)
-		zone = FIRSTZONE-1;
+		zone = FIRSTZONE - 1;
 	while (++zone < ZONES)
 		if (zone_in_use(zone))
 			return zone;
 	return 0;
 }
 
-void make_bad_inode(void)
+static void make_bad_inode(void)
 {
-	struct minix_inode * inode = &Inode[MINIX_BAD_INO];
-	int i,j,zone;
-	int ind=0,dind=0;
-	unsigned short ind_block[BLOCK_SIZE>>1];
-	unsigned short dind_block[BLOCK_SIZE>>1];
+	struct minix_inode *inode = &Inode[MINIX_BAD_INO];
+	int i, j, zone;
+	int ind = 0, dind = 0;
+	unsigned short ind_block[BLOCK_SIZE >> 1];
+	unsigned short dind_block[BLOCK_SIZE >> 1];
 
 #define NEXT_BAD (zone = next(zone))
 
@@ -345,43 +428,42 @@ void make_bad_inode(void)
 	inode->i_nlinks = 1;
 	inode->i_time = time(NULL);
 	inode->i_mode = S_IFREG + 0000;
-	inode->i_size = badblocks*BLOCK_SIZE;
+	inode->i_size = badblocks * BLOCK_SIZE;
 	zone = next(0);
-	for (i=0 ; i<7 ; i++) {
+	for (i = 0; i < 7; i++) {
 		inode->i_zone[i] = zone;
 		if (!NEXT_BAD)
 			goto end_bad;
 	}
 	inode->i_zone[7] = ind = get_free_block();
-	memset(ind_block,0,BLOCK_SIZE);
-	for (i=0 ; i<512 ; i++) {
+	memset(ind_block, 0, BLOCK_SIZE);
+	for (i = 0; i < 512; i++) {
 		ind_block[i] = zone;
 		if (!NEXT_BAD)
 			goto end_bad;
 	}
 	inode->i_zone[8] = dind = get_free_block();
-	memset(dind_block,0,BLOCK_SIZE);
-	for (i=0 ; i<512 ; i++) {
-		write_block(ind,(char *) ind_block);
+	memset(dind_block, 0, BLOCK_SIZE);
+	for (i = 0; i < 512; i++) {
+		write_block(ind, (char *) ind_block);
 		dind_block[i] = ind = get_free_block();
-		memset(ind_block,0,BLOCK_SIZE);
-		for (j=0 ; j<512 ; j++) {
+		memset(ind_block, 0, BLOCK_SIZE);
+		for (j = 0; j < 512; j++) {
 			ind_block[j] = zone;
 			if (!NEXT_BAD)
 				goto end_bad;
 		}
 	}
-	die(_("too many bad blocks"));
-end_bad:
+	die("too many bad blocks");
+  end_bad:
 	if (ind)
 		write_block(ind, (char *) ind_block);
 	if (dind)
 		write_block(dind, (char *) dind_block);
 }
 
-#ifdef HAVE_MINIX2
-void
-make_bad_inode2 (void)
+#ifdef BB_FEATURE_MINIX2
+static void make_bad_inode2(void)
 {
 	struct minix2_inode *inode = &Inode2[MINIX_BAD_INO];
 	int i, j, zone;
@@ -391,30 +473,30 @@ make_bad_inode2 (void)
 
 	if (!badblocks)
 		return;
-	mark_inode (MINIX_BAD_INO);
+	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 = time(NULL);
 	inode->i_mode = S_IFREG + 0000;
 	inode->i_size = badblocks * BLOCK_SIZE;
-	zone = next (0);
+	zone = next(0);
 	for (i = 0; i < 7; i++) {
 		inode->i_zone[i] = zone;
 		if (!NEXT_BAD)
 			goto end_bad;
 	}
-	inode->i_zone[7] = ind = get_free_block ();
-	memset (ind_block, 0, BLOCK_SIZE);
+	inode->i_zone[7] = ind = get_free_block();
+	memset(ind_block, 0, BLOCK_SIZE);
 	for (i = 0; i < 256; i++) {
 		ind_block[i] = zone;
 		if (!NEXT_BAD)
 			goto end_bad;
 	}
-	inode->i_zone[8] = dind = get_free_block ();
-	memset (dind_block, 0, BLOCK_SIZE);
+	inode->i_zone[8] = dind = get_free_block();
+	memset(dind_block, 0, BLOCK_SIZE);
 	for (i = 0; i < 256; i++) {
-		write_block (ind, (char *) ind_block);
-		dind_block[i] = ind = get_free_block ();
-		memset (ind_block, 0, BLOCK_SIZE);
+		write_block(ind, (char *) ind_block);
+		dind_block[i] = ind = get_free_block();
+		memset(ind_block, 0, BLOCK_SIZE);
 		for (j = 0; j < 256; j++) {
 			ind_block[j] = zone;
 			if (!NEXT_BAD)
@@ -422,47 +504,46 @@ make_bad_inode2 (void)
 		}
 	}
 	/* Could make triple indirect block here */
-	die (_("too many bad blocks"));
- end_bad:
+	die("too many bad blocks");
+  end_bad:
 	if (ind)
-		write_block (ind, (char *) ind_block);
+		write_block(ind, (char *) ind_block);
 	if (dind)
-		write_block (dind, (char *) dind_block);
+		write_block(dind, (char *) dind_block);
 }
 #endif
 
-void make_root_inode(void)
+static void make_root_inode(void)
 {
-	struct minix_inode * inode = &Inode[MINIX_ROOT_INO];
+	struct minix_inode *inode = &Inode[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_size = 3 * dirsize;
 	else {
-		root_block[2*dirsize] = '\0';
-		root_block[2*dirsize+1] = '\0';
-		inode->i_size = 2*dirsize;
+		root_block[2 * dirsize] = '\0';
+		root_block[2 * dirsize + 1] = '\0';
+		inode->i_size = 2 * dirsize;
 	}
 	inode->i_mode = S_IFDIR + 0755;
 	inode->i_uid = getuid();
 	if (inode->i_uid)
 		inode->i_gid = getgid();
-	write_block(inode->i_zone[0],root_block);
+	write_block(inode->i_zone[0], root_block);
 }
 
-#ifdef HAVE_MINIX2
-void
-make_root_inode2 (void)
+#ifdef BB_FEATURE_MINIX2
+static void make_root_inode2(void)
 {
 	struct minix2_inode *inode = &Inode2[MINIX_ROOT_INO];
 
-	mark_inode (MINIX_ROOT_INO);
-	inode->i_zone[0] = get_free_block ();
+	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);
+	inode->i_atime = inode->i_mtime = inode->i_ctime = time(NULL);
 	if (badblocks)
 		inode->i_size = 3 * dirsize;
 	else {
@@ -474,43 +555,47 @@ make_root_inode2 (void)
 	inode->i_uid = getuid();
 	if (inode->i_uid)
 		inode->i_gid = getgid();
-	write_block (inode->i_zone[0], root_block);
+	write_block(inode->i_zone[0], root_block);
 }
 #endif
 
-void setup_tables(void)
+static void setup_tables(void)
 {
 	int i;
 	unsigned long inodes;
 
-	memset(super_block_buffer,0,BLOCK_SIZE);
-	memset(boot_block_buffer,0,512);
+	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;
+	MAXSIZE = version2 ? 0x7fffffff : (7 + 512 + 512 * 512) * 1024;
 	ZONES = BLOCKS;
 /* some magic nrs: 1 inode / 3 blocks */
-	if ( req_nr_inodes == 0 ) 
-		inodes = BLOCKS/3;
+	if (req_nr_inodes == 0)
+		inodes = BLOCKS / 3;
 	else
 		inodes = req_nr_inodes;
 	/* Round up inode count to fill block size */
-#ifdef HAVE_MINIX2
+#ifdef BB_FEATURE_MINIX2
 	if (version2)
 		inodes = ((inodes + MINIX2_INODES_PER_BLOCK - 1) &
-			  ~(MINIX2_INODES_PER_BLOCK - 1));
+				  ~(MINIX2_INODES_PER_BLOCK - 1));
 	else
 #endif
 		inodes = ((inodes + MINIX_INODES_PER_BLOCK - 1) &
-			  ~(MINIX_INODES_PER_BLOCK - 1));
+				  ~(MINIX_INODES_PER_BLOCK - 1));
 	if (inodes > 65535)
 		inodes = 65535;
 	INODES = inodes;
-	IMAPS = UPPER(INODES + 1,BITS_PER_BLOCK);
+	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 = 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
@@ -519,51 +604,48 @@ void setup_tables(void)
 	 * dd if=/dev/zero of=test.fs count=10 bs=1024
 	 * /sbin/mkfs.minix -i 200 test.fs
 	 * */
-	if (i>=999) {
-		die ("unable to allocate buffers for maps");
+	if (i >= 999) {
+		die("unable to allocate buffers for maps");
 	}
 	FIRSTZONE = NORM_FIRSTZONE;
-	inode_map = malloc(IMAPS * BLOCK_SIZE);
-	zone_map = malloc(ZMAPS * BLOCK_SIZE);
-	if (!inode_map || !zone_map)
-		die(_("unable to allocate buffers for maps"));
-	memset(inode_map,0xff,IMAPS * BLOCK_SIZE);
-	memset(zone_map,0xff,ZMAPS * BLOCK_SIZE);
-	for (i = FIRSTZONE ; i<ZONES ; i++)
+	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++)
+	for (i = MINIX_ROOT_INO; i <= INODES; i++)
 		unmark_inode(i);
-	inode_buffer = malloc(INODE_BUFFER_SIZE);
-	if (!inode_buffer)
-		die(_("unable to allocate buffer for inodes"));
-	memset(inode_buffer,0,INODE_BUFFER_SIZE);
-	printf(_("%ld inodes\n"),INODES);
-	printf(_("%ld blocks\n"),ZONES);
-	printf(_("Firstdatazone=%ld (%ld)\n"),FIRSTZONE,NORM_FIRSTZONE);
-	printf(_("Zonesize=%d\n"),BLOCK_SIZE<<ZONESIZE);
-	printf(_("Maxsize=%ld\n\n"),MAXSIZE);
+	inode_buffer = xmalloc(INODE_BUFFER_SIZE);
+	memset(inode_buffer, 0, INODE_BUFFER_SIZE);
+	printf("%ld inodes\n", INODES);
+	printf("%ld blocks\n", ZONES);
+	printf("Firstdatazone=%ld (%ld)\n", FIRSTZONE, NORM_FIRSTZONE);
+	printf("Zonesize=%d\n", BLOCK_SIZE << ZONESIZE);
+	printf("Maxsize=%ld\n\n", MAXSIZE);
 }
 
 /*
  * Perform a test of a block; return the number of
  * blocks readable/writeable.
  */
-long do_check(char * buffer, int try, unsigned int current_block) 
+long do_check(char *buffer, int try, unsigned int current_block)
 {
 	long got;
-	
+
 	/* Seek to the correct loc. */
 	if (lseek(DEV, current_block * BLOCK_SIZE, SEEK_SET) !=
-                       current_block * BLOCK_SIZE ) {
-                 die(_("seek failed during testing of blocks"));
+		current_block * BLOCK_SIZE) {
+		die("seek failed during testing of blocks");
 	}
 
 
 	/* Try the read */
 	got = read(DEV, buffer, try * BLOCK_SIZE);
-	if (got < 0) got = 0;	
-	if (got & (BLOCK_SIZE - 1 )) {
-		printf(_("Weird values in do_check: probably bugs\n"));
+	if (got < 0)
+		got = 0;
+	if (got & (BLOCK_SIZE - 1)) {
+		printf("Weird values in do_check: probably bugs\n");
 	}
 	got /= BLOCK_SIZE;
 	return got;
@@ -571,11 +653,11 @@ long do_check(char * buffer, int try, unsigned int current_block)
 
 static unsigned int currently_testing = 0;
 
-void alarm_intr(int alnum)
+static void alarm_intr(int alnum)
 {
 	if (currently_testing >= ZONES)
 		return;
-	signal(SIGALRM,alarm_intr);
+	signal(SIGALRM, alarm_intr);
 	alarm(5);
 	if (!currently_testing)
 		return;
@@ -583,173 +665,212 @@ void alarm_intr(int alnum)
 	fflush(stdout);
 }
 
-void check_blocks(void)
+static void check_blocks(void)
 {
-	int try,got;
+	int try, got;
 	static char buffer[BLOCK_SIZE * TEST_BUFFER_BLOCKS];
 
-	currently_testing=0;
-	signal(SIGALRM,alarm_intr);
+	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)
-			die(_("seek failed in check_blocks"));
+		if (lseek(DEV, currently_testing * BLOCK_SIZE, SEEK_SET) !=
+			currently_testing * BLOCK_SIZE)
+			die("seek failed in check_blocks");
 		try = TEST_BUFFER_BLOCKS;
 		if (currently_testing + try > ZONES)
-			try = ZONES-currently_testing;
+			try = ZONES - currently_testing;
 		got = do_check(buffer, try, currently_testing);
 		currently_testing += got;
 		if (got == try)
 			continue;
 		if (currently_testing < FIRSTZONE)
-			die(_("bad blocks before data-area: cannot make fs"));
+			die("bad blocks before data-area: cannot make fs");
 		mark_zone(currently_testing);
 		badblocks++;
 		currently_testing++;
 	}
 	if (badblocks > 1)
-		printf(_("%d bad blocks\n"), badblocks);
+		printf("%d bad blocks\n", badblocks);
 	else if (badblocks == 1)
-		printf(_("one bad block\n"));
+		printf("one bad block\n");
 }
 
-void get_list_blocks(filename)
+static void get_list_blocks(filename)
 char *filename;
 
 {
-  FILE *listfile;
-  unsigned long blockno;
-
-  listfile=fopen(filename,"r");
-  if(listfile == (FILE *)NULL) {
-    die(_("can't open file of bad blocks"));
-  }
-  while(!feof(listfile)) {
-    fscanf(listfile,"%ld\n", &blockno);
-    mark_zone(blockno);
-    badblocks++;
-  }
-  if(badblocks > 1)
-    printf(_("%d bad blocks\n"), badblocks);
-  else if (badblocks == 1)
-    printf(_("one bad block\n"));
+	FILE *listfile;
+	unsigned long blockno;
+
+	listfile = fopen(filename, "r");
+	if (listfile == (FILE *) NULL) {
+		die("can't open file of bad blocks");
+	}
+	while (!feof(listfile)) {
+		fscanf(listfile, "%ld\n", &blockno);
+		mark_zone(blockno);
+		badblocks++;
+	}
+	if (badblocks > 1)
+		printf("%d bad blocks\n", badblocks);
+	else if (badblocks == 1)
+		printf("one bad block\n");
 }
 
-extern int 
-mkfs_minix_main(int argc, char ** argv)
+extern int mkfs_minix_main(int argc, char **argv)
 {
-  int i;
-  char * tmp;
-  struct stat statbuf;
-  char * listfile = NULL;
-
-  if (argc && *argv)
-    program_name = *argv;
-  if (INODE_SIZE * MINIX_INODES_PER_BLOCK != BLOCK_SIZE)
-    die(_("bad inode size"));
-#ifdef HAVE_MINIX2
-  if (INODE_SIZE2 * MINIX2_INODES_PER_BLOCK != BLOCK_SIZE)
-    die(_("bad inode size"));
+	int i=1;
+	char *tmp;
+	struct stat statbuf;
+	char *listfile = NULL;
+	int stopIt=FALSE;
+
+	if (INODE_SIZE * MINIX_INODES_PER_BLOCK != BLOCK_SIZE)
+		die("bad inode size");
+#ifdef BB_FEATURE_MINIX2
+	if (INODE_SIZE2 * MINIX2_INODES_PER_BLOCK != BLOCK_SIZE)
+		die("bad inode size");
 #endif
-  opterr = 0;
-  while ((i = getopt(argc, argv, "ci:l:n:v")) != EOF)
-    switch (i) {
-      case 'c':
-	check=1; break;
-      case 'i':
-        req_nr_inodes = (unsigned long) atol(optarg);
-	break;
-      case 'l':
-	listfile = optarg; break;
-      case 'n':
-	i = strtoul(optarg,&tmp,0);
-	if (*tmp)
-	  usage();
-	if (i == 14)
-	  magic = MINIX_SUPER_MAGIC;
-	else if (i == 30)
-	  magic = MINIX_SUPER_MAGIC2;
-	else
-	  usage();
-	namelen = i;
-	dirsize = i+2;
-	break;
-      case 'v':
-#ifdef HAVE_MINIX2
-	version2 = 1;
+	
+	/* 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)
+								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)
+								show_usage();
+							if (i == 14)
+								magic = MINIX_SUPER_MAGIC;
+							else if (i == 30)
+								magic = MINIX_SUPER_MAGIC2;
+							else 
+								show_usage();
+							namelen = i;
+							dirsize = i + 2;
+							stopIt=TRUE;
+							break;
+						}
+					case 'v':
+#ifdef BB_FEATURE_MINIX2
+						version2 = 1;
 #else
-	fatal_error(_("%s: not compiled with minix v2 support\n"),-1);
+						errorMsg("%s: not compiled with minix v2 support\n",
+								device_name);
+						exit(-1);
 #endif
-	break;
-      default:
-	usage();
-    }
-  argc -= optind;
-  argv += optind;
-  if (argc > 0 && !device_name) {
-    device_name = argv[0];
-    argc--;
-    argv++;
-  }
-  if (argc > 0) {
-     BLOCKS = strtol(argv[0],&tmp,0);
-     if (*tmp) {
-       printf(_("strtol error: number of blocks not specified"));
-       usage();
-     }
-  }
-
-  if (device_name && !BLOCKS)
-    BLOCKS = get_size (device_name) / 1024;
-  if (!device_name || BLOCKS<10) {
-    usage();
-  }
-#ifdef HAVE_MINIX2
-  if (version2) {
-    if (namelen == 14)
-      magic = MINIX2_SUPER_MAGIC;
-    else
-      magic = MINIX2_SUPER_MAGIC2;
-  } else
+						break;
+					case '-':
+					case 'h':
+					default:
+goodbye:
+						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) {
+		show_usage();
+	}
+#ifdef BB_FEATURE_MINIX2
+	if (version2) {
+		if (namelen == 14)
+			magic = MINIX2_SUPER_MAGIC;
+		else
+			magic = MINIX2_SUPER_MAGIC2;
+	} else
 #endif
-    if (BLOCKS > 65535)
-      BLOCKS = 65535;
-  check_mount();		/* is it already mounted? */
-  tmp = root_block;
-  *(short *)tmp = 1;
-  strcpy(tmp+2,".");
-  tmp += dirsize;
-  *(short *)tmp = 1;
-  strcpy(tmp+2,"..");
-  tmp += dirsize;
-  *(short *)tmp = 2;
-  strcpy(tmp+2,".badblocks");
-  DEV = open(device_name,O_RDWR );
-  if (DEV<0)
-    die(_("unable to open %s"));
-  if (fstat(DEV,&statbuf)<0)
-    die(_("unable to stat %s"));
-  if (!S_ISBLK(statbuf.st_mode))
-    check=0;
-  else if (statbuf.st_rdev == 0x0300 || statbuf.st_rdev == 0x0340)
-    die(_("will not try to make filesystem on '%s'"));
-  setup_tables();
-  if (check)
-    check_blocks();
-  else if (listfile)
-    get_list_blocks(listfile);
-#ifdef HAVE_MINIX2
-  if (version2) {
-    make_root_inode2 ();
-    make_bad_inode2 ();
-  } else
+	if (BLOCKS > 65535)
+		BLOCKS = 65535;
+	check_mount();				/* is it already mounted? */
+	tmp = root_block;
+	*(short *) tmp = 1;
+	strcpy(tmp + 2, ".");
+	tmp += dirsize;
+	*(short *) tmp = 1;
+	strcpy(tmp + 2, "..");
+	tmp += dirsize;
+	*(short *) tmp = 2;
+	strcpy(tmp + 2, ".badblocks");
+	DEV = open(device_name, O_RDWR);
+	if (DEV < 0)
+		die("unable to open %s");
+	if (fstat(DEV, &statbuf) < 0)
+		die("unable to stat %s");
+	if (!S_ISBLK(statbuf.st_mode))
+		check = 0;
+	else if (statbuf.st_rdev == 0x0300 || statbuf.st_rdev == 0x0340)
+		die("will not try to make filesystem on '%s'");
+	setup_tables();
+	if (check)
+		check_blocks();
+	else if (listfile)
+		get_list_blocks(listfile);
+#ifdef BB_FEATURE_MINIX2
+	if (version2) {
+		make_root_inode2();
+		make_bad_inode2();
+	} else
 #endif
-    {
-      make_root_inode();
-      make_bad_inode();
-    }
-  mark_good_blocks();
-  write_tables();
-  return 0;
+	{
+		make_root_inode();
+		make_bad_inode();
+	}
+	mark_good_blocks();
+	write_tables();
+	return( 0);
+
 }