X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=util-linux%2Fmkfs_minix.c;h=b1d538dcc6deede012fd97b2189c1d2cb04d4abc;hb=248d2220f9985754268f4492278758052494b80a;hp=c6f057a0787ef6bc9fc48e2b22ea6ec0bafd4c14;hpb=8ea7d8cdaf4a03cdc06abc8b752b589271140a88;p=oweals%2Fbusybox.git

diff --git a/util-linux/mkfs_minix.c b/util-linux/mkfs_minix.c
index c6f057a07..b1d538dcc 100644
--- a/util-linux/mkfs_minix.c
+++ b/util-linux/mkfs_minix.c
@@ -35,7 +35,7 @@
  *
  * 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
  *		program.  (Daniel Quinlan, quinlan@yggdrasil.com)
@@ -49,20 +49,19 @@
  *
  * Usage:  mkfs [-c | -l filename ] [-v] [-nXX] [-iXX] device [size-in-blocks]
  *
- *	-c for readablility checking (SLOW!)
+ *	-c for readability checking (SLOW!)
  *      -l for getting a list of bad blocks from a file.
  *	-n for namelength (currently the kernel only uses 14 or 30)
  *	-i for number of inodes
  *	-v for v2 filesystem
  *
  * 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 :-). 
+ * 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>
@@ -71,19 +70,105 @@
 #include <fcntl.h>
 #include <ctype.h>
 #include <stdlib.h>
+#include <stdint.h>
 #include <termios.h>
-#include <sys/stat.h>
 #include <sys/ioctl.h>
 #include <sys/param.h>
 #include <mntent.h>
+#include "busybox.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. */
 
-#include <linux/fs.h>
-#include <linux/minix_fs.h>
+#define MINIX_INODES_PER_BLOCK ((BLOCK_SIZE)/(sizeof (struct minix_inode)))
+#define MINIX2_INODES_PER_BLOCK ((BLOCK_SIZE)/(sizeof (struct minix2_inode)))
 
-#ifdef MINIX2_SUPER_MAGIC2
-#define HAVE_MINIX2 1
+#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];
+};
+
+/*
+ * 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;
+};
+
+struct minix_dir_entry {
+	uint16_t 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
@@ -96,7 +181,7 @@
 
 #define UPPER(size,n) (((size)+((n)-1))/(n))
 #define INODE_SIZE (sizeof(struct minix_inode))
-#ifdef HAVE_MINIX2
+#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))
@@ -107,42 +192,41 @@
 
 #define BITS_PER_BLOCK (BLOCK_SIZE<<3)
 
-static char *program_name = "mkfs";
-static char *device_name = NULL;
+static char *device_name;
 static int DEV = -1;
-static long BLOCKS = 0;
-static int check = 0;
-static int badblocks = 0;
+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 = 0;
+static int version2;
 
-static char root_block[BLOCK_SIZE] = "\0";
+static char root_block[BLOCK_SIZE];
 
-static char *inode_buffer = NULL;
+static char *inode_buffer;
 
 #define Inode (((struct minix_inode *) inode_buffer)-1)
-#ifdef HAVE_MINIX2
+#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 ((unsigned long)Super.s_ninodes)
-#ifdef HAVE_MINIX2
-#define ZONES ((unsigned long)(version2 ? Super.s_zones : Super.s_nzones))
+#define INODES (Super.s_ninodes)
+#ifdef CONFIG_FEATURE_MINIX2
+#define ZONES (version2 ? Super.s_zones : Super.s_nzones)
 #else
-#define ZONES ((unsigned long)(Super.s_nzones))
+#define ZONES (Super.s_nzones)
 #endif
-#define IMAPS ((unsigned long)Super.s_imap_blocks)
-#define ZMAPS ((unsigned long)Super.s_zmap_blocks)
-#define FIRSTZONE ((unsigned long)Super.s_firstdatazone)
-#define ZONESIZE ((unsigned long)Super.s_log_zone_size)
-#define MAXSIZE ((unsigned long)Super.s_max_size)
+#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)
 
@@ -150,11 +234,15 @@ static char *inode_map;
 static char *zone_map;
 
 static unsigned short good_blocks_table[MAX_GOOD_BLOCKS];
-static int used_good_blocks = 0;
-static unsigned long req_nr_inodes = 0;
+static int used_good_blocks;
+static unsigned long req_nr_inodes;
 
-#define inode_in_use(x) (isset(inode_map,(x)))
-#define zone_in_use(x) (isset(zone_map,(x)-FIRSTZONE+1))
+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))
 
 #define mark_inode(x) (setbit(inode_map,(x)))
 #define unmark_inode(x) (clrbit(inode_map,(x)))
@@ -162,46 +250,12 @@ static unsigned long req_nr_inodes = 0;
 #define mark_zone(x) (setbit(zone_map,(x)-FIRSTZONE+1))
 #define unmark_zone(x) (clrbit(zone_map,(x)-FIRSTZONE+1))
 
-/*
- * Volatile to let gcc know that this doesn't return. When trying
- * to compile this under minix, volatile gives a warning, as
- * exit() isn't defined as volatile under minix.
- */
-static volatile void die(char *str)
-{
-	fprintf(stderr, "%s: %s\n", program_name, str);
-	exit(8);
-}
-
-static volatile void show_usage() __attribute__ ((noreturn));
-static volatile void show_usage()
-{
-	fprintf(stderr, "BusyBox v%s (%s) multi-call binary -- GPL2\n\n",
-			BB_VER, BB_BT);
-	fprintf(stderr,
-			"Usage: %s [-c | -l filename] [-nXX] [-iXX] /dev/name [blocks]\n",
-			program_name);
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	fprintf(stderr, "\nMake a MINIX filesystem.\n\n");
-	fprintf(stderr, "OPTIONS:\n");
-	fprintf(stderr, "\t-c\t\tCheck the device for bad blocks\n");
-	fprintf(stderr,
-			"\t-n [14|30]\tSpecify the maximum length of filenames\n");
-	fprintf(stderr,
-			"\t-i\t\tSpecify the number of inodes for the filesystem\n");
-	fprintf(stderr,
-			"\t-l FILENAME\tRead the bad blocks list from FILENAME\n");
-	fprintf(stderr, "\t-v\t\tMake a Minix version 2 filesystem\n\n");
-#endif
-	exit(16);
-}
-
 /*
  * 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)
+static inline void check_mount(void)
 {
 	FILE *f;
 	struct mntent *mnt;
@@ -215,7 +269,7 @@ static void check_mount(void)
 	if (!mnt)
 		return;
 
-	die("%s is mounted; will not make a filesystem here!");
+	bb_error_msg_and_die("%s is mounted; will not make a filesystem here!", device_name);
 }
 
 static long valid_offset(int fd, int offset)
@@ -229,7 +283,7 @@ static long valid_offset(int fd, int offset)
 	return 1;
 }
 
-static int count_blocks(int fd)
+static inline int count_blocks(int fd)
 {
 	int high, low;
 
@@ -248,16 +302,13 @@ static int count_blocks(int fd)
 	return (low + 1);
 }
 
-static int get_size(const char *file)
+static inline int get_size(const char *file)
 {
 	int fd;
 	long size;
 
-	fd = open(file, O_RDWR);
-	if (fd < 0) {
-		perror(file);
-		exit(1);
-	}
+	if ((fd = open(file, O_RDWR)) < 0)
+		bb_perror_msg_and_die("%s", file);
 	if (ioctl(fd, BLKGETSIZE, &size) >= 0) {
 		close(fd);
 		return (size * 512);
@@ -268,35 +319,35 @@ static int get_size(const char *file)
 	return size;
 }
 
-static void write_tables(void)
+static inline 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");
+		bb_error_msg_and_die("seek to boot block failed in write_tables");
 	if (512 != write(DEV, boot_block_buffer, 512))
-		die("unable to clear boot sector");
+		bb_error_msg_and_die("unable to clear boot sector");
 	if (BLOCK_SIZE != lseek(DEV, BLOCK_SIZE, SEEK_SET))
-		die("seek failed in write_tables");
+		bb_error_msg_and_die("seek failed in write_tables");
 	if (BLOCK_SIZE != write(DEV, super_block_buffer, BLOCK_SIZE))
-		die("unable to write super-block");
+		bb_error_msg_and_die("unable to write super-block");
 	if (IMAPS * BLOCK_SIZE != write(DEV, inode_map, IMAPS * BLOCK_SIZE))
-		die("unable to write inode map");
+		bb_error_msg_and_die("unable to write inode map");
 	if (ZMAPS * BLOCK_SIZE != write(DEV, zone_map, ZMAPS * BLOCK_SIZE))
-		die("unable to write zone map");
+		bb_error_msg_and_die("unable to write zone map");
 	if (INODE_BUFFER_SIZE != write(DEV, inode_buffer, INODE_BUFFER_SIZE))
-		die("unable to write inodes");
+		bb_error_msg_and_die("unable to write inodes");
 
 }
 
 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");
+		bb_error_msg_and_die("seek failed in write_block");
 	if (BLOCK_SIZE != write(DEV, buffer, BLOCK_SIZE))
-		die("write failed in write_block");
+		bb_error_msg_and_die("write failed in write_block");
 }
 
 static int get_free_block(void)
@@ -304,7 +355,7 @@ static int get_free_block(void)
 	int blk;
 
 	if (used_good_blocks + 1 >= MAX_GOOD_BLOCKS)
-		die("too many bad blocks");
+		bb_error_msg_and_die("too many bad blocks");
 	if (used_good_blocks)
 		blk = good_blocks_table[used_good_blocks - 1] + 1;
 	else
@@ -312,13 +363,13 @@ static int get_free_block(void)
 	while (blk < ZONES && zone_in_use(blk))
 		blk++;
 	if (blk >= ZONES)
-		die("not enough good blocks");
+		bb_error_msg_and_die("not enough good blocks");
 	good_blocks_table[used_good_blocks] = blk;
 	used_good_blocks++;
 	return blk;
 }
 
-static void mark_good_blocks(void)
+static inline void mark_good_blocks(void)
 {
 	int blk;
 
@@ -326,7 +377,7 @@ static void mark_good_blocks(void)
 		mark_zone(good_blocks_table[blk]);
 }
 
-inline int next(int zone)
+static int next(int zone)
 {
 	if (!zone)
 		zone = FIRSTZONE - 1;
@@ -336,7 +387,7 @@ inline int next(int zone)
 	return 0;
 }
 
-static void make_bad_inode(void)
+static inline void make_bad_inode(void)
 {
 	struct minix_inode *inode = &Inode[MINIX_BAD_INO];
 	int i, j, zone;
@@ -378,7 +429,7 @@ static void make_bad_inode(void)
 				goto end_bad;
 		}
 	}
-	die("too many bad blocks");
+	bb_error_msg_and_die("too many bad blocks");
   end_bad:
 	if (ind)
 		write_block(ind, (char *) ind_block);
@@ -386,8 +437,8 @@ static void make_bad_inode(void)
 		write_block(dind, (char *) dind_block);
 }
 
-#ifdef HAVE_MINIX2
-static void make_bad_inode2(void)
+#ifdef CONFIG_FEATURE_MINIX2
+static inline void make_bad_inode2(void)
 {
 	struct minix2_inode *inode = &Inode2[MINIX_BAD_INO];
 	int i, j, zone;
@@ -428,7 +479,7 @@ static void make_bad_inode2(void)
 		}
 	}
 	/* Could make triple indirect block here */
-	die("too many bad blocks");
+	bb_error_msg_and_die("too many bad blocks");
   end_bad:
 	if (ind)
 		write_block(ind, (char *) ind_block);
@@ -437,7 +488,7 @@ static void make_bad_inode2(void)
 }
 #endif
 
-static void make_root_inode(void)
+static inline void make_root_inode(void)
 {
 	struct minix_inode *inode = &Inode[MINIX_ROOT_INO];
 
@@ -459,8 +510,8 @@ static void make_root_inode(void)
 	write_block(inode->i_zone[0], root_block);
 }
 
-#ifdef HAVE_MINIX2
-static void make_root_inode2(void)
+#ifdef CONFIG_FEATURE_MINIX2
+static inline void make_root_inode2(void)
 {
 	struct minix2_inode *inode = &Inode2[MINIX_ROOT_INO];
 
@@ -483,7 +534,7 @@ static void make_root_inode2(void)
 }
 #endif
 
-static void setup_tables(void)
+static inline void setup_tables(void)
 {
 	int i;
 	unsigned long inodes;
@@ -493,14 +544,20 @@ static void setup_tables(void)
 	MAGIC = magic;
 	ZONESIZE = 0;
 	MAXSIZE = version2 ? 0x7fffffff : (7 + 512 + 512 * 512) * 1024;
-	ZONES = BLOCKS;
+#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 HAVE_MINIX2
+#ifdef CONFIG_FEATURE_MINIX2
 	if (version2)
 		inodes = ((inodes + MINIX2_INODES_PER_BLOCK - 1) &
 				  ~(MINIX2_INODES_PER_BLOCK - 1));
@@ -529,7 +586,7 @@ static void setup_tables(void)
 	 * /sbin/mkfs.minix -i 200 test.fs
 	 * */
 	if (i >= 999) {
-		die("unable to allocate buffers for maps");
+		bb_error_msg_and_die("unable to allocate buffers for maps");
 	}
 	FIRSTZONE = NORM_FIRSTZONE;
 	inode_map = xmalloc(IMAPS * BLOCK_SIZE);
@@ -542,25 +599,25 @@ static void setup_tables(void)
 		unmark_inode(i);
 	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("%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", MAXSIZE);
+	printf("Maxsize=%ld\n\n", (long)MAXSIZE);
 }
 
 /*
  * Perform a test of a block; return the number of
- * blocks readable/writeable.
+ * blocks readable/writable.
  */
-long do_check(char *buffer, int try, unsigned int current_block)
+static inline 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");
+		bb_error_msg_and_die("seek failed during testing of blocks");
 	}
 
 
@@ -575,7 +632,7 @@ long do_check(char *buffer, int try, unsigned int current_block)
 	return got;
 }
 
-static unsigned int currently_testing = 0;
+static unsigned int currently_testing;
 
 static void alarm_intr(int alnum)
 {
@@ -600,7 +657,7 @@ static void check_blocks(void)
 	while (currently_testing < ZONES) {
 		if (lseek(DEV, currently_testing * BLOCK_SIZE, SEEK_SET) !=
 			currently_testing * BLOCK_SIZE)
-			die("seek failed in check_blocks");
+			bb_error_msg_and_die("seek failed in check_blocks");
 		try = TEST_BUFFER_BLOCKS;
 		if (currently_testing + try > ZONES)
 			try = ZONES - currently_testing;
@@ -609,7 +666,7 @@ static void check_blocks(void)
 		if (got == try)
 			continue;
 		if (currently_testing < FIRSTZONE)
-			die("bad blocks before data-area: cannot make fs");
+			bb_error_msg_and_die("bad blocks before data-area: cannot make fs");
 		mark_zone(currently_testing);
 		badblocks++;
 		currently_testing++;
@@ -620,17 +677,12 @@ static void check_blocks(void)
 		printf("one bad block\n");
 }
 
-static void get_list_blocks(filename)
-char *filename;
-
+static void get_list_blocks(char *filename)
 {
 	FILE *listfile;
 	unsigned long blockno;
 
-	listfile = fopen(filename, "r");
-	if (listfile == (FILE *) NULL) {
-		die("can't open file of bad blocks");
-	}
+	listfile = bb_xfopen(filename, "r");
 	while (!feof(listfile)) {
 		fscanf(listfile, "%ld\n", &blockno);
 		mark_zone(blockno);
@@ -644,39 +696,46 @@ char *filename;
 
 extern int mkfs_minix_main(int argc, char **argv)
 {
-	int i;
+	int i=1;
 	char *tmp;
 	struct stat statbuf;
 	char *listfile = NULL;
 	int stopIt=FALSE;
 
-	if (argc && *argv)
-		program_name = *argv;
 	if (INODE_SIZE * MINIX_INODES_PER_BLOCK != BLOCK_SIZE)
-		die("bad inode size");
-#ifdef HAVE_MINIX2
+		bb_error_msg_and_die("bad inode size");
+#ifdef CONFIG_FEATURE_MINIX2
 	if (INODE_SIZE2 * MINIX2_INODES_PER_BLOCK != BLOCK_SIZE)
-		die("bad inode size");
+		bb_error_msg_and_die("bad inode size");
 #endif
-	
+
 	/* Parse options */
-	//printf("argc='%d'  argv='%s'\n", argc, *argv);
 	argv++;
 	while (--argc >= 0 && *argv && **argv) {
 		if (**argv == '-') {
 			stopIt=FALSE;
 			while (i > 0 && *++(*argv) && stopIt==FALSE) {
-				//printf("argc='%d'  argv='%s'\n", argc, *argv);
 				switch (**argv) {
 					case 'c':
 						check = 1;
 						break;
 					case 'i':
-						if (--argc == 0) {
-							goto goodbye;
+						{
+							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;
 						}
-						req_nr_inodes = (unsigned long) atol(*(++argv));
-						break;
 					case 'l':
 						if (--argc == 0) {
 							goto goodbye;
@@ -687,35 +746,34 @@ extern int mkfs_minix_main(int argc, char **argv)
 						{
 							char *cp=NULL;
 
-							if (--argc == 0) {
-								goto goodbye;
-							}
 							if (*(*argv+1) != 0) {
 								cp = ++(*argv);
 							} else {
+								if (--argc == 0) {
+									goto goodbye;
+								}
 								cp = *(++argv);
 							}
 							i = strtoul(cp, &tmp, 0);
-							//printf("cp='%s'   i='%d'\n", cp, i);
 							if (*tmp)
-								show_usage();
+								bb_show_usage();
 							if (i == 14)
 								magic = MINIX_SUPER_MAGIC;
 							else if (i == 30)
 								magic = MINIX_SUPER_MAGIC2;
-							else 
-								show_usage();
+							else
+								bb_show_usage();
 							namelen = i;
 							dirsize = i + 2;
 							stopIt=TRUE;
 							break;
 						}
 					case 'v':
-#ifdef HAVE_MINIX2
+#ifdef CONFIG_FEATURE_MINIX2
 						version2 = 1;
 #else
-						fprintf(stderr, "%s: not compiled with minix v2 support\n",
-								program_name, device_name);
+						bb_error_msg("%s: not compiled with minix v2 support",
+								device_name);
 						exit(-1);
 #endif
 						break;
@@ -723,11 +781,10 @@ extern int mkfs_minix_main(int argc, char **argv)
 					case 'h':
 					default:
 goodbye:
-						show_usage();
+						bb_show_usage();
 				}
 			}
 		} else {
-			//printf("else:  argc='%d'  argv='%s'\n", argc, *argv);
 			if (device_name == NULL)
 				device_name = *argv;
 			else if (BLOCKS == 0)
@@ -742,9 +799,9 @@ goodbye:
 	if (device_name && !BLOCKS)
 		BLOCKS = get_size(device_name) / 1024;
 	if (!device_name || BLOCKS < 10) {
-		show_usage();
+		bb_show_usage();
 	}
-#ifdef HAVE_MINIX2
+#ifdef CONFIG_FEATURE_MINIX2
 	if (version2) {
 		if (namelen == 14)
 			magic = MINIX2_SUPER_MAGIC;
@@ -766,19 +823,19 @@ goodbye:
 	strcpy(tmp + 2, ".badblocks");
 	DEV = open(device_name, O_RDWR);
 	if (DEV < 0)
-		die("unable to open %s");
+		bb_error_msg_and_die("unable to open %s", device_name);
 	if (fstat(DEV, &statbuf) < 0)
-		die("unable to stat %s");
+		bb_error_msg_and_die("unable to stat %s", device_name);
 	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'");
+		bb_error_msg_and_die("will not try to make filesystem on '%s'", device_name);
 	setup_tables();
 	if (check)
 		check_blocks();
 	else if (listfile)
 		get_list_blocks(listfile);
-#ifdef HAVE_MINIX2
+#ifdef CONFIG_FEATURE_MINIX2
 	if (version2) {
 		make_root_inode2();
 		make_bad_inode2();
@@ -790,6 +847,6 @@ goodbye:
 	}
 	mark_good_blocks();
 	write_tables();
-	exit( 0);
+	return 0;
 
 }