* removed getopt based parser and added a hand rolled one.
*/
-#include "internal.h"
+#include "busybox.h"
#include <stdio.h>
#include <time.h>
#include <unistd.h>
#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 <linux/fs.h>
-#include <linux/minix_fs.h>
-#ifdef MINIX2_SUPER_MAGIC2
-#define HAVE_MINIX2 1
+typedef unsigned char u8;
+typedef unsigned short u16;
+typedef unsigned int u32;
+
+
+#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
#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))
#define BITS_PER_BLOCK (BLOCK_SIZE<<3)
-static char *program_name = "mkfs";
static char *device_name = NULL;
static int DEV = -1;
static long BLOCKS = 0;
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];
#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))
static int used_good_blocks = 0;
static unsigned long req_nr_inodes = 0;
-#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)))
*/
static volatile void die(char *str)
{
- fprintf(stderr, "%s: %s\n", program_name, str);
+ error_msg("%s\n", 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);
+ usage(mkfs_minix_usage);
}
/*
int fd;
long size;
- fd = open(file, O_RDWR);
- if (fd < 0) {
- perror(file);
- exit(1);
- }
+ if ((fd = open(file, O_RDWR)) < 0)
+ perror_msg_and_die("%s", file);
if (ioctl(fd, BLKGETSIZE, &size) >= 0) {
close(fd);
return (size * 512);
write_block(dind, (char *) dind_block);
}
-#ifdef HAVE_MINIX2
+#ifdef BB_FEATURE_MINIX2
static void make_bad_inode2(void)
{
struct minix2_inode *inode = &Inode2[MINIX_BAD_INO];
write_block(inode->i_zone[0], root_block);
}
-#ifdef HAVE_MINIX2
+#ifdef BB_FEATURE_MINIX2
static void make_root_inode2(void)
{
struct minix2_inode *inode = &Inode2[MINIX_ROOT_INO];
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));
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
+#ifdef BB_FEATURE_MINIX2
if (INODE_SIZE2 * MINIX2_INODES_PER_BLOCK != BLOCK_SIZE)
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)
+ show_usage();
+ stopIt=TRUE;
+ break;
}
- req_nr_inodes = (unsigned long) atol(*(++argv));
- break;
case 'l':
if (--argc == 0) {
goto goodbye;
{
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();
if (i == 14)
break;
}
case 'v':
-#ifdef HAVE_MINIX2
+#ifdef BB_FEATURE_MINIX2
version2 = 1;
#else
- fprintf(stderr, "%s: not compiled with minix v2 support\n",
- program_name, device_name);
+ error_msg("%s: not compiled with minix v2 support\n",
+ device_name);
exit(-1);
#endif
break;
}
}
} else {
- //printf("else: argc='%d' argv='%s'\n", argc, *argv);
if (device_name == NULL)
device_name = *argv;
else if (BLOCKS == 0)
if (!device_name || BLOCKS < 10) {
show_usage();
}
-#ifdef HAVE_MINIX2
+#ifdef BB_FEATURE_MINIX2
if (version2) {
if (namelen == 14)
magic = MINIX2_SUPER_MAGIC;
check_blocks();
else if (listfile)
get_list_blocks(listfile);
-#ifdef HAVE_MINIX2
+#ifdef BB_FEATURE_MINIX2
if (version2) {
make_root_inode2();
make_bad_inode2();
}
mark_good_blocks();
write_tables();
- exit( 0);
+ return( 0);
}