More stuff

8 files changed, 4280 insertions, 0 deletions

diff --git a/applets/busybox.c b/applets/busybox.c
index 6bcb65297..4849ba0a4 100644
--- a/applets/busybox.c
+++ b/applets/busybox.c
@@ -51,6 +51,12 @@ static const struct Applet applets[] = {
 #ifdef BB_FIND                  //usr/bin
     {"find", find_main},
 #endif
+#ifdef BB_FSCK_MINIX            //sbin
+    {"fsck.minix", fsck_minix_main},
+#endif
+#ifdef BB_MKFS_MINIX            //sbin
+    {"mkfs.minix", mkfs_minix_main},
+#endif
 #ifdef BB_GREP                  //bin
     {"grep", grep_main},
 #endif
diff --git a/busybox.c b/busybox.c
index 6bcb65297..4849ba0a4 100644
--- a/busybox.c
+++ b/busybox.c
@@ -51,6 +51,12 @@ static const struct Applet applets[] = {
 #ifdef BB_FIND                  //usr/bin
     {"find", find_main},
 #endif
+#ifdef BB_FSCK_MINIX            //sbin
+    {"fsck.minix", fsck_minix_main},
+#endif
+#ifdef BB_MKFS_MINIX            //sbin
+    {"mkfs.minix", mkfs_minix_main},
+#endif
 #ifdef BB_GREP                  //bin
     {"grep", grep_main},
 #endif
diff --git a/busybox.def.h b/busybox.def.h
index c90297aa2..39bde4ddd 100644
--- a/busybox.def.h
+++ b/busybox.def.h
@@ -16,6 +16,8 @@
 //#define BB_DUTMP
 #define BB_FDFLUSH
 #define BB_FIND
+#define BB_FSCK_MINIX
+#define BB_MKFS_MINIX
 #define BB_GREP
 #define BB_HALT
 #define BB_INIT
diff --git a/fsck_minix.c b/fsck_minix.c
new file mode 100644
index 000000000..e4b14d705
--- /dev/null
+++ b/fsck_minix.c
@@ -0,0 +1,1377 @@
+/*
+ * fsck.c - a file system consistency checker for Linux.
+ *
+ * (C) 1991, 1992 Linus Torvalds. This file may be redistributed
+ * as per the GNU copyleft.
+ */
+
+/*
+ * 09.11.91  -  made the first rudimetary functions
+ *
+ * 10.11.91  -  updated, does checking, no repairs yet.
+ *              Sent out to the mailing-list for testing.
+ *
+ * 14.11.91  -  Testing seems to have gone well. Added some
+ *              correction-code, and changed some functions.
+ *
+ * 15.11.91  -  More correction code. Hopefully it notices most
+ *              cases now, and tries to do something about them.
+ *
+ * 16.11.91  -  More corrections (thanks to Mika Jalava). Most
+ *              things seem to work now. Yeah, sure.
+ *
+ *
+ * 19.04.92  -  Had to start over again from this old version, as a
+ *              kernel bug ate my enhanced fsck in february.
+ *
+ * 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
+ *
+ * Sat Oct  9 11:17:11 1993, faith@cs.unc.edu: make exit status conform
+ *                           to that required by fsutil
+ *
+ * Mon Jan  3 11:06:52 1994 - Dr. Wettstein (greg%wind.uucp@plains.nodak.edu)
+ *                            Added support for file system valid flag.  Also
+ *                            added program_version variable and output of
+ *                            program name and version number when program
+ *                            is executed.
+ *
+ * 30.10.94 - added support for v2 filesystem
+ *            (Andreas Schwab, schwab@issan.informatik.uni-dortmund.de)
+ *
+ * 10.12.94  -  added test to prevent checking of mounted fs adapted
+ *              from Theodore Ts'o's (tytso@athena.mit.edu) e2fsck
+ *              program.  (Daniel Quinlan, quinlan@yggdrasil.com)
+ *
+ * 01.07.96  - Fixed the v2 fs stuff to use the right #defines and such
+ *             for modern libcs (janl@math.uio.no, Nicolai Langfeldt)
+ *
+ * 02.07.96  - Added C bit fiddling routines from rmk@ecs.soton.ac.uk 
+ *             (Russell King).  He made them for ARM.  It would seem
+ *             that the ARM is powerful enough to do this in C whereas
+ *             i386 and m64k must use assembly to get it fast >:-)
+ *             This should make minix fsck systemindependent.
+ *             (janl@math.uio.no, Nicolai Langfeldt)
+ *
+ * 04.11.96  - Added minor fixes from Andreas Schwab to avoid compiler
+ *             warnings.  Added mc68k bitops from 
+ *             Joerg Dorchain <dorchain@mpi-sb.mpg.de>.
+ *
+ * 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>
+ * - added Native Language Support
+ *
+ *
+ * I've had no time to add comments - hopefully the function names
+ * are comments enough. As with all file system checkers, this assumes
+ * the file system is quiescent - don't use it on a mounted device
+ * unless you can be sure nobody is writing to it (and remember that the
+ * kernel can write to it when it searches for files).
+ *
+ * Usuage: fsck [-larvsm] device
+ *      -l for a listing of all the filenames
+ *      -a for automatic repairs (not implemented)
+ *      -r for repairs (interactive) (not implemented)
+ *      -v for verbose (tells how many files)
+ *      -s for super-block info
+ *      -m for minix-like "mode not cleared" warnings
+ *      -f force filesystem check even if filesystem marked as valid
+ *
+ * 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 :-). 
+ */
+
+#include <stdio.h>
+#include <errno.h>
+#include <unistd.h>
+#include <string.h>
+#include <fcntl.h>
+#include <ctype.h>
+#include <stdlib.h>
+#include <termios.h>
+#include <mntent.h>
+#include <sys/stat.h>
+
+#include <linux/fs.h>
+#include <linux/minix_fs.h>
+#include "../version.h"
+#include "nls.h"
+
+#ifdef MINIX2_SUPER_MAGIC2
+#define HAVE_MINIX2 1
+#endif
+
+#ifndef __linux__
+#define volatile
+#endif
+
+#define ROOT_INO 1
+
+#define UPPER(size,n) ((size+((n)-1))/(n))
+#define INODE_SIZE (sizeof(struct minix_inode))
+#ifdef HAVE_MINIX2
+#define INODE_SIZE2 (sizeof(struct minix2_inode))
+#define INODE_BLOCKS UPPER(INODES, (version2 ? MINIX2_INODES_PER_BLOCK \
+                                    : MINIX_INODES_PER_BLOCK))
+#else
+#define INODE_BLOCKS UPPER(INODES, (MINIX_INODES_PER_BLOCK))
+#endif
+#define INODE_BUFFER_SIZE (INODE_BLOCKS * BLOCK_SIZE)
+
+#define BITS_PER_BLOCK (BLOCK_SIZE<<3)
+
+static char * program_name = "fsck.minix";
+static char * program_version = "1.2 - 11/11/96";
+static char * device_name = NULL;
+static int IN;
+static int repair=0, automatic=0, verbose=0, list=0, show=0, warn_mode=0, 
+        force=0;
+static int directory=0, regular=0, blockdev=0, chardev=0, links=0,
+                symlinks=0, total=0;
+
+static int changed = 0; /* flags if the filesystem has been changed */
+static int errors_uncorrected = 0; /* flag if some error was not corrected */
+static int dirsize = 16;
+static int namelen = 14;
+static int version2 = 0;
+static struct termios termios;
+static int termios_set = 0;
+
+/* File-name data */
+#define MAX_DEPTH 50
+static int name_depth = 0;
+static char name_list[MAX_DEPTH][NAME_MAX+1];
+
+static char * inode_buffer = NULL;
+#define Inode (((struct minix_inode *) inode_buffer)-1)
+#define Inode2 (((struct minix2_inode *) inode_buffer)-1)
+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
+#define ZONES ((unsigned long)(version2 ? Super.s_zones : Super.s_nzones))
+#else
+#define ZONES ((unsigned long)(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 MAGIC (Super.s_magic)
+#define NORM_FIRSTZONE (2+IMAPS+ZMAPS+INODE_BLOCKS)
+
+static char *inode_map;
+static char *zone_map;
+
+static unsigned char * inode_count = NULL;
+static unsigned char * zone_count = NULL;
+
+void recursive_check(unsigned int ino);
+void recursive_check2(unsigned int ino);
+
+#include "bitops.h"
+
+#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)),changed=1)
+#define unmark_inode(x) (clrbit(inode_map,(x)),changed=1)
+
+#define mark_zone(x) (setbit(zone_map,(x)-FIRSTZONE+1),changed=1)
+#define unmark_zone(x) (clrbit(zone_map,(x)-FIRSTZONE+1),changed=1)
+
+void leave(int) __attribute__ ((noreturn));
+void leave(int status)
+{
+        if (termios_set)
+                tcsetattr(0, TCSANOW, &termios);
+        exit(status);
+}
+
+void usage(void) {
+        fprintf(stderr,
+                _("Usage: %s [-larvsmf] /dev/name\n"),
+                program_name);
+        leave(16);
+}
+
+void die(const char *str) {
+        fprintf(stderr, "%s: %s\n", program_name, str);
+        leave(8);
+}
+
+/*
+ * This simply goes through the file-name data and prints out the
+ * current file.
+ */
+void print_current_name(void)
+{
+        int i=0;
+
+        while (i<name_depth)
+                printf("/%.*s",namelen,name_list[i++]);
+        if (i == 0)
+                printf ("/");
+}
+
+int ask(const char * string, int def)
+{
+        int c;
+
+        if (!repair) {
+                printf("\n");
+                errors_uncorrected = 1;
+                return 0;
+        }
+        if (automatic) {
+                printf("\n");
+                if (!def)
+                      errors_uncorrected = 1;
+                return def;
+        }
+        printf(def?"%s (y/n)? ":"%s (n/y)? ",string);
+        for (;;) {
+                fflush(stdout);
+                if ((c=getchar())==EOF) {
+                        if (!def)
+                              errors_uncorrected = 1;
+                        return def;
+                }
+                c=toupper(c);
+                if (c == 'Y') {
+                        def = 1;
+                        break;
+                } else if (c == 'N') {
+                        def = 0;
+                        break;
+                } else if (c == ' ' || c == '\n')
+                        break;
+        }
+        if (def)
+                printf("y\n");
+        else {
+                printf("n\n");
+                errors_uncorrected = 1;
+             }
+        return def;
+}
+
+/*
+ * Make certain that we aren't checking a filesystem that is on a
+ * mounted partition.  Code adapted from e2fsck, Copyright (C) 1993,
+ * 1994 Theodore Ts'o.  Also licensed under GPL.
+ */
+static void check_mount(void)
+{
+        FILE * f;
+        struct mntent * mnt;
+        int cont;
+        int fd;
+
+        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;
+
+        /*
+         * If the root is mounted read-only, then /etc/mtab is
+         * probably not correct; so we won't issue a warning based on
+         * it.
+         */
+        fd = open(MOUNTED, O_RDWR);
+        if (fd < 0 && errno == EROFS)
+                return;
+        else
+                close(fd);
+        
+        printf (_("%s is mounted.        "), device_name);
+        if (isatty(0) && isatty(1))
+                cont = ask(_("Do you really want to continue"), 0);
+        else
+                cont = 0;
+        if (!cont) {
+                printf (_("check aborted.\n"));
+                exit (0);
+        }
+        return;
+}
+
+/*
+ * check_zone_nr checks to see that *nr is a valid zone nr. If it
+ * isn't, it will possibly be repaired. Check_zone_nr sets *corrected
+ * if an error was corrected, and returns the zone (0 for no zone
+ * or a bad zone-number).
+ */
+int check_zone_nr(unsigned short * nr, int * corrected)
+{
+        if (!*nr)
+                return 0;
+        if (*nr < FIRSTZONE)
+                printf(_("Zone nr < FIRSTZONE in file `"));
+        else if (*nr >= ZONES)
+                printf(_("Zone nr >= ZONES in file `"));
+        else
+                return *nr;
+        print_current_name();
+        printf("'.");
+        if (ask(_("Remove block"),1)) {
+                *nr = 0;
+                *corrected = 1;
+        }
+        return 0;
+}
+
+#ifdef HAVE_MINIX2
+int check_zone_nr2 (unsigned int *nr, int *corrected)
+{
+        if (!*nr)
+                return 0;
+        if (*nr < FIRSTZONE)
+                printf (_("Zone nr < FIRSTZONE in file `"));
+        else if (*nr >= ZONES)
+                printf (_("Zone nr >= ZONES in file `"));
+        else
+                return *nr;
+        print_current_name ();
+        printf ("'.");
+        if (ask (_("Remove block"), 1)) {
+                *nr = 0;
+                *corrected = 1;
+        }
+        return 0;
+}
+#endif
+
+/*
+ * read-block reads block nr into the buffer at addr.
+ */
+void read_block(unsigned int nr, char * addr)
+{
+        if (!nr) {
+                memset(addr,0,BLOCK_SIZE);
+                return;
+        }
+        if (BLOCK_SIZE*nr != lseek(IN, BLOCK_SIZE*nr, SEEK_SET)) {
+                printf(_("Read error: unable to seek to block in file '"));
+                print_current_name();
+                printf("'\n");
+                memset(addr,0,BLOCK_SIZE);
+                errors_uncorrected = 1;
+        } else if (BLOCK_SIZE != read(IN, addr, BLOCK_SIZE)) {
+                printf(_("Read error: bad block in file '"));
+                print_current_name();
+                printf("'\n");
+                memset(addr,0,BLOCK_SIZE);
+                errors_uncorrected = 1;
+        }
+}
+
+/*
+ * write_block writes block nr to disk.
+ */
+void write_block(unsigned int nr, char * addr)
+{
+        if (!nr)
+                return;
+        if (nr < FIRSTZONE || nr >= ZONES) {
+                printf(_("Internal error: trying to write bad block\n"
+                "Write request ignored\n"));
+                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(_("Write error: bad block in file '"));
+                print_current_name();
+                printf("'\n");
+                errors_uncorrected = 1;
+        }
+}
+
+/*
+ * map-block calculates the absolute block nr of a block in a file.
+ * It sets 'changed' if the inode has needed changing, and re-writes
+ * any indirect blocks with errors.
+ */
+int map_block(struct minix_inode * inode, unsigned int blknr)
+{
+        unsigned short ind[BLOCK_SIZE>>1];
+        unsigned short dind[BLOCK_SIZE>>1];
+        int blk_chg, block, result;
+
+        if (blknr<7)
+                return check_zone_nr(inode->i_zone + blknr, &changed);
+        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;
+        }
+        blknr -= 512;
+        block = check_zone_nr(inode->i_zone + 8, &changed);
+        read_block(block, (char *) dind);
+        blk_chg = 0;
+        result = check_zone_nr(dind + (blknr/512), &blk_chg);
+        if (blk_chg)
+                write_block(block, (char *) dind);
+        block = result;
+        read_block(block, (char *) ind);
+        blk_chg = 0;
+        result = check_zone_nr(ind + (blknr%512), &blk_chg);
+        if (blk_chg)
+                write_block(block, (char *) ind);
+        return result;
+}
+
+#ifdef HAVE_MINIX2
+int map_block2 (struct minix2_inode *inode, unsigned int blknr)
+{
+        unsigned int ind[BLOCK_SIZE >> 2];
+        unsigned int dind[BLOCK_SIZE >> 2];
+        unsigned int tind[BLOCK_SIZE >> 2];
+        int blk_chg, block, result;
+
+        if (blknr < 7)
+                return check_zone_nr2 (inode->i_zone + blknr, &changed);
+        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;
+        }
+        blknr -= 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;
+        }
+        blknr -= 256 * 256;
+        block = check_zone_nr2 (inode->i_zone + 9, &changed);
+        read_block (block, (char *) tind);
+        blk_chg = 0;
+        result = check_zone_nr2 (tind + blknr / (256 * 256), &blk_chg);
+        if (blk_chg)
+                write_block (block, (char *) tind);
+        block = result;
+        read_block (block, (char *) dind);
+        blk_chg = 0;
+        result = check_zone_nr2 (dind + (blknr / 256) % 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;
+}
+#endif
+
+void write_super_block(void)
+{
+        /*
+         * Set the state of the filesystem based on whether or not there
+         * are uncorrected errors.  The filesystem valid flag is
+         * unconditionally set if we get this far.
+         */
+        Super.s_state |= MINIX_VALID_FS;
+        if ( errors_uncorrected )
+                Super.s_state |= MINIX_ERROR_FS;
+        else
+                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(_("unable to write super-block"));
+
+        return;
+}
+
+void write_tables(void)
+{
+        write_super_block();
+
+        if (IMAPS*BLOCK_SIZE != write(IN,inode_map,IMAPS*BLOCK_SIZE))
+                die(_("Unable to write inode map"));
+        if (ZMAPS*BLOCK_SIZE != write(IN,zone_map,ZMAPS*BLOCK_SIZE))
+                die(_("Unable to write zone map"));
+        if (INODE_BUFFER_SIZE != write(IN,inode_buffer,INODE_BUFFER_SIZE))
+                die(_("Unable to write inodes"));
+}
+
+void get_dirsize (void)
+{
+        int block;
+        char blk[BLOCK_SIZE];
+        int size;
+
+#if HAVE_MINIX2
+        if (version2)
+                block = Inode2[ROOT_INO].i_zone[0];
+        else
+#endif
+                block = Inode[ROOT_INO].i_zone[0];
+        read_block (block, blk);
+        for (size = 16; size < BLOCK_SIZE; size <<= 1) {
+                if (strcmp (blk + size + 2, "..") == 0) {
+                        dirsize = size;
+                        namelen = size - 2;
+                        return;
+                }
+        }
+        /* use defaults */
+}
+
+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(_("unable to read super block"));
+        if (MAGIC == MINIX_SUPER_MAGIC) {
+                namelen = 14;
+                dirsize = 16;
+                version2 = 0;
+        } else if (MAGIC == MINIX_SUPER_MAGIC2) {
+                namelen = 30;
+                dirsize = 32;
+                version2 = 0;
+#ifdef HAVE_MINIX2
+        } else if (MAGIC == MINIX2_SUPER_MAGIC) {
+                namelen = 14;
+                dirsize = 16;
+                version2 = 1;
+        } else if (MAGIC == MINIX2_SUPER_MAGIC2) {
+                namelen = 30;
+                dirsize = 32;
+                version2 = 1;
+#endif
+        } else
+                die(_("bad magic number in super-block"));
+        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"));
+        if (ZMAPS * BLOCK_SIZE * 8 < ZONES - FIRSTZONE + 1)
+                die(_("bad s_zmap_blocks field in super-block"));
+}
+
+void read_tables(void)
+{
+        inode_map = malloc(IMAPS * BLOCK_SIZE);
+        if (!inode_map)
+                die(_("Unable to allocate buffer for inode map"));
+        zone_map = malloc(ZMAPS * BLOCK_SIZE);
+        if (!inode_map)
+                die("Unable to allocate buffer for zone map");
+        memset(inode_map,0,sizeof(inode_map));
+        memset(zone_map,0,sizeof(zone_map));
+        inode_buffer = malloc(INODE_BUFFER_SIZE);
+        if (!inode_buffer)
+                die(_("Unable to allocate buffer for inodes"));
+        inode_count = malloc(INODES + 1);
+        if (!inode_count)
+                die(_("Unable to allocate buffer for inode count"));
+        zone_count = malloc(ZONES);
+        if (!zone_count)
+                die(_("Unable to allocate buffer for zone count"));
+        if (IMAPS*BLOCK_SIZE != read(IN,inode_map,IMAPS*BLOCK_SIZE))
+                die(_("Unable to read inode map"));
+        if (ZMAPS*BLOCK_SIZE != read(IN,zone_map,ZMAPS*BLOCK_SIZE))
+                die(_("Unable to read zone map"));
+        if (INODE_BUFFER_SIZE != read(IN,inode_buffer,INODE_BUFFER_SIZE))
+                die(_("Unable to read inodes"));
+        if (NORM_FIRSTZONE != FIRSTZONE) {
+                printf(_("Warning: Firstzone != Norm_firstzone\n"));
+                errors_uncorrected = 1;
+        }
+        get_dirsize ();
+        if (show) {
+                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"),MAXSIZE);
+                printf(_("Filesystem state=%d\n"), Super.s_state);
+                printf(_("namelen=%d\n\n"),namelen);
+        }
+}
+
+struct minix_inode * get_inode(unsigned int nr)
+{
+        struct minix_inode * inode;
+
+        if (!nr || nr > INODES)
+                return NULL;
+        total++;
+        inode = Inode + nr;
+        if (!inode_count[nr]) {
+                if (!inode_in_use(nr)) {
+                        printf(_("Inode %d marked not used, but used for file '"),
+                                nr);
+                        print_current_name();
+                        printf("'\n");
+                        if (repair) {
+                                if (ask(_("Mark 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 {
+                        print_current_name();
+                        printf(_(" has mode %05o\n"),inode->i_mode);
+                }
+
+        } else
+                links++;
+        if (!++inode_count[nr]) {
+                printf(_("Warning: inode count too big.\n"));
+                inode_count[nr]--;
+                errors_uncorrected = 1;
+        }
+        return inode;
+}
+
+#ifdef HAVE_MINIX2
+struct minix2_inode *
+get_inode2 (unsigned int nr)
+{
+        struct minix2_inode *inode;
+
+        if (!nr || nr > INODES)
+                return NULL;
+        total++;
+        inode = Inode2 + nr;
+        if (!inode_count[nr]) {
+                if (!inode_in_use (nr)) {
+                        printf (_("Inode %d marked not used, but used for file '"), nr);
+                        print_current_name ();
+                        printf ("'\n");
+                        if (repair) {
+                                if (ask (_("Mark 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 {
+                        print_current_name ();
+                        printf (_(" has mode %05o\n"), inode->i_mode);
+                }
+        } else
+                links++;
+        if (!++inode_count[nr]) {
+                printf (_("Warning: inode count too big.\n"));
+                inode_count[nr]--;
+                errors_uncorrected = 1;
+        }
+        return inode;
+}
+#endif
+
+void check_root(void)
+{
+        struct minix_inode * inode = Inode + ROOT_INO;
+
+        if (!inode || !S_ISDIR(inode->i_mode))
+                die(_("root inode isn't a directory"));
+}
+
+#ifdef HAVE_MINIX2
+void check_root2 (void)
+{
+        struct minix2_inode *inode = Inode2 + ROOT_INO;
+
+        if (!inode || !S_ISDIR (inode->i_mode))
+                die ("root inode isn't a directory");
+}
+#endif
+
+static int add_zone(unsigned short * znr, int * corrected)
+{
+        int result;
+        int block;
+
+        result = 0;
+        block = check_zone_nr(znr, corrected);
+        if (!block)
+                return 0;
+        if (zone_count[block]) {
+                printf(_("Block has been used before. Now in file `"));
+                print_current_name();
+                printf("'.");
+                if (ask(_("Clear"),1)) {
+                        *znr = 0;
+                        block = 0;
+                        *corrected = 1;
+                }
+        }
+        if (!block)
+                return 0;
+        if (!zone_in_use(block)) {
+                printf(_("Block %d in file `"),block);
+                print_current_name();
+                printf(_("' is marked not in use."));
+                if (ask(_("Correct"),1))
+                        mark_zone(block);
+        }
+        if (!++zone_count[block])
+                zone_count[block]--;
+        return block;
+}
+
+#ifdef HAVE_MINIX2
+static int add_zone2 (unsigned int *znr, int *corrected)
+{
+        int result;
+        int block;
+
+        result = 0;
+        block = check_zone_nr2 (znr, corrected);
+        if (!block)
+                return 0;
+        if (zone_count[block]) {
+                printf (_("Block has been used before. Now in file `"));
+                print_current_name ();
+                printf ("'.");
+                if (ask (_("Clear"), 1)) {
+                        *znr = 0;
+                        block = 0;
+                        *corrected = 1;
+                }
+        }
+        if (!block)
+                return 0;
+        if (!zone_in_use (block)) {
+                printf (_("Block %d in file `"), block);
+                print_current_name ();
+                printf (_("' is marked not in use."));
+                if (ask (_("Correct"), 1))
+                        mark_zone (block);
+        }
+        if (!++zone_count[block])
+                zone_count[block]--;
+        return block;
+}
+#endif
+
+static void add_zone_ind(unsigned short * znr, int * corrected)
+{
+        static char blk[BLOCK_SIZE];
+        int i, chg_blk=0;
+        int block;
+
+        block = add_zone(znr, corrected);
+        if (!block)
+                return;
+        read_block(block, blk);
+        for (i=0 ; i < (BLOCK_SIZE>>1) ; i++)
+                add_zone(i + (unsigned short *) blk, &chg_blk);
+        if (chg_blk)
+                write_block(block, blk);
+}
+
+#ifdef HAVE_MINIX2
+static void
+add_zone_ind2 (unsigned int *znr, int *corrected)
+{
+        static char blk[BLOCK_SIZE];
+        int i, chg_blk = 0;
+        int block;
+
+        block = add_zone2 (znr, corrected);
+        if (!block)
+                return;
+        read_block (block, blk);
+        for (i = 0; i < BLOCK_SIZE >> 2; i++)
+                add_zone2 (i + (unsigned int *) blk, &chg_blk);
+        if (chg_blk)
+                write_block (block, blk);
+}
+#endif
+
+static void add_zone_dind(unsigned short * znr, int * corrected)
+{
+        static char blk[BLOCK_SIZE];
+        int i, blk_chg=0;
+        int block;
+
+        block = add_zone(znr, corrected);
+        if (!block)
+                return;
+        read_block(block, blk);
+        for (i=0 ; i < (BLOCK_SIZE>>1) ; i++)
+                add_zone_ind(i + (unsigned short *) blk, &blk_chg);
+        if (blk_chg)
+                write_block(block, blk);
+}
+
+#ifdef HAVE_MINIX2
+static void
+add_zone_dind2 (unsigned int *znr, int *corrected)
+{
+        static char blk[BLOCK_SIZE];
+        int i, blk_chg = 0;
+        int block;
+
+        block = add_zone2 (znr, corrected);
+        if (!block)
+                return;
+        read_block (block, blk);
+        for (i = 0; i < BLOCK_SIZE >> 2; i++)
+                add_zone_ind2 (i + (unsigned int *) blk, &blk_chg);
+        if (blk_chg)
+                write_block (block, blk);
+}
+
+static void
+add_zone_tind2 (unsigned int *znr, int *corrected)
+{
+        static char blk[BLOCK_SIZE];
+        int i, blk_chg = 0;
+        int block;
+
+        block = add_zone2 (znr, corrected);
+        if (!block)
+                return;
+        read_block (block, blk);
+        for (i = 0; i < BLOCK_SIZE >> 2; i++)
+                add_zone_dind2 (i + (unsigned int *) blk, &blk_chg);
+        if (blk_chg)
+                write_block (block, blk);
+}
+#endif
+
+void check_zones(unsigned int i)
+{
+        struct minix_inode * inode;
+
+        if (!i || i > INODES)
+                return;
+        if (inode_count[i] > 1) /* have we counted this file already? */
+                return;
+        inode = Inode + i;
+        if (!S_ISDIR(inode->i_mode) && !S_ISREG(inode->i_mode) &&
+            !S_ISLNK(inode->i_mode))
+                return;
+        for (i=0 ; i<7 ; i++)
+                add_zone(i + inode->i_zone, &changed);
+        add_zone_ind(7 + inode->i_zone, &changed);
+        add_zone_dind(8 + inode->i_zone, &changed);
+}
+
+#ifdef HAVE_MINIX2
+void
+check_zones2 (unsigned int i)
+{
+        struct minix2_inode *inode;
+
+        if (!i || i > INODES)
+                return;
+        if (inode_count[i] > 1) /* have we counted this file already? */
+                return;
+        inode = Inode2 + i;
+        if (!S_ISDIR (inode->i_mode) && !S_ISREG (inode->i_mode)
+            && !S_ISLNK (inode->i_mode))
+                return;
+        for (i = 0; i < 7; i++)
+                add_zone2 (i + inode->i_zone, &changed);
+        add_zone_ind2 (7 + inode->i_zone, &changed);
+        add_zone_dind2 (8 + inode->i_zone, &changed);
+        add_zone_tind2 (9 + inode->i_zone, &changed);
+}
+#endif
+
+void check_file(struct minix_inode * dir, unsigned int offset)
+{
+        static char blk[BLOCK_SIZE];
+        struct minix_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;
+        ino = * (unsigned short *) (name-2);
+        if (ino > INODES) {
+                print_current_name();
+                printf(_(" contains a bad inode number for file '"));
+                printf("%.*s'.",namelen,name);
+                if (ask(_(" Remove"),1)) {
+                        *(unsigned short *)(name-2) = 0;
+                        write_block(block, blk);
+                }
+                ino = 0;
+        }       
+        if (name_depth < MAX_DEPTH)
+                strncpy (name_list[name_depth], name, namelen);
+        name_depth++;
+        inode = get_inode(ino);
+        name_depth--;
+        if (!offset) {
+                if (!inode || strcmp(".",name)) {
+                        print_current_name();
+                        printf(_(": bad directory: '.' isn't first\n"));
+                        errors_uncorrected = 1;
+                } else return;
+        }
+        if (offset == dirsize) {
+                if (!inode || strcmp("..",name)) {
+                        print_current_name();
+                        printf(_(": bad directory: '..' isn't second\n"));
+                        errors_uncorrected = 1;
+                } else return;
+        }
+        if (!inode)
+                return;
+        if (name_depth < MAX_DEPTH)
+                strncpy(name_list[name_depth],name,namelen);
+        name_depth++;   
+        if (list) {
+                if (verbose)
+                        printf("%6d %07o %3d ",ino,inode->i_mode,inode->i_nlinks);
+                print_current_name();
+                if (S_ISDIR(inode->i_mode))
+                        printf(":\n");
+                else
+                        printf("\n");
+        }
+        check_zones(ino);
+        if (inode && S_ISDIR(inode->i_mode))
+                recursive_check(ino);
+        name_depth--;
+        return;
+}
+
+#ifdef HAVE_MINIX2
+void
+check_file2 (struct minix2_inode *dir, unsigned int 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;
+        ino = *(unsigned short *) (name - 2);
+        if (ino > INODES) {
+                print_current_name ();
+                printf (_(" contains a bad inode number for file '"));
+                printf ("%.*s'.", namelen, name);
+                if (ask (_(" Remove"), 1)) {
+                        *(unsigned short *) (name - 2) = 0;
+                        write_block (block, blk);
+                }
+                ino = 0;
+        }
+        if (name_depth < MAX_DEPTH)
+                strncpy (name_list[name_depth], name, namelen);
+        name_depth++;
+        inode = get_inode2 (ino);
+        name_depth--;
+        if (!offset) {
+                if (!inode || strcmp (".", name)) {
+                        print_current_name ();
+                        printf (_(": bad directory: '.' isn't first\n"));
+                        errors_uncorrected = 1;
+                } else
+                        return;
+        }
+        if (offset == dirsize) {
+                if (!inode || strcmp ("..", name)) {
+                        print_current_name ();
+                        printf (_(": bad directory: '..' isn't second\n"));
+                        errors_uncorrected = 1;
+                } else
+                        return;
+        }
+        if (!inode)
+                return;
+        name_depth++;
+        if (list) {
+                if (verbose)
+                        printf ("%6d %07o %3d ", ino, inode->i_mode, inode->i_nlinks);
+                print_current_name ();
+                if (S_ISDIR (inode->i_mode))
+                        printf (":\n");
+                else
+                        printf ("\n");
+        }
+        check_zones2 (ino);
+        if (inode && S_ISDIR (inode->i_mode))
+                recursive_check2 (ino);
+        name_depth--;
+        return;
+}
+#endif
+
+void recursive_check(unsigned int ino)
+{
+        struct minix_inode * dir;
+        unsigned int offset;
+
+        dir = Inode + ino;
+        if (!S_ISDIR(dir->i_mode))
+                die(_("internal error"));
+        if (dir->i_size < 2 * dirsize) {
+                print_current_name();
+                printf(_(": bad directory: size<32"));
+                errors_uncorrected = 1;
+        }
+        for (offset = 0 ; offset < dir->i_size ; offset += dirsize)
+                check_file(dir,offset);
+}
+
+#ifdef HAVE_MINIX2
+void
+recursive_check2 (unsigned int ino)
+{
+        struct minix2_inode *dir;
+        unsigned int offset;
+
+        dir = Inode2 + ino;
+        if (!S_ISDIR (dir->i_mode))
+                die ("internal error");
+        if (dir->i_size < 2 * dirsize) {
+                print_current_name ();
+                printf (_(": bad directory: size < 32"));
+                errors_uncorrected = 1;
+        }
+        for (offset = 0; offset < dir->i_size; offset += dirsize)
+                check_file2 (dir, offset);
+}
+#endif
+
+int bad_zone(int i)
+{
+        char buffer[1024];
+
+        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));
+}
+
+void check_counts(void)
+{
+        int i;
+
+        for (i=1 ; i <= INODES ; i++) {
+                if (!inode_in_use(i) && Inode[i].i_mode && warn_mode) {
+                        printf(_("Inode %d mode not cleared."),i);
+                        if (ask(_("Clear"),1)) {
+                                Inode[i].i_mode = 0;
+                                changed = 1;
+                        }
+                }
+                if (!inode_count[i]) {
+                        if (!inode_in_use(i))
+                                continue;
+                        printf(_("Inode %d not used, marked used in the bitmap."),i);
+                        if (ask(_("Clear"),1))
+                                unmark_inode(i);
+                        continue;
+                }
+                if (!inode_in_use(i)) {
+                        printf(_("Inode %d used, marked unused in the bitmap."),
+                                i);
+                        if (ask("Set",1))
+                                mark_inode(i);
+                }
+                if (Inode[i].i_nlinks != inode_count[i]) {
+                        printf(_("Inode %d (mode = %07o), i_nlinks=%d, counted=%d."),
+                                i,Inode[i].i_mode,Inode[i].i_nlinks,inode_count[i]);
+                        if (ask(_("Set i_nlinks to count"),1)) {
+                                Inode[i].i_nlinks=inode_count[i];
+                                changed=1;
+                        }
+                }
+        }
+        for (i=FIRSTZONE ; i < ZONES ; i++) {
+                if (zone_in_use(i) == zone_count[i])
+                        continue;
+                if (!zone_count[i]) {
+                        if (bad_zone(i))
+                                continue;
+                        printf(_("Zone %d: marked in use, no file uses it."),i);
+                        if (ask(_("Unmark"),1))
+                                unmark_zone(i);
+                        continue;
+                }
+                printf(_("Zone %d: %sin use, counted=%d\n"),
+                i,zone_in_use(i)?"":_("not "),zone_count[i]);
+        }
+}
+
+#ifdef HAVE_MINIX2
+void
+check_counts2 (void)
+{
+        int i;
+
+        for (i = 1; i <= INODES; i++) {
+                if (!inode_in_use (i) && Inode2[i].i_mode && warn_mode) {
+                        printf (_("Inode %d mode not cleared."), i);
+                        if (ask (_("Clear"), 1)) {
+                                Inode2[i].i_mode = 0;
+                                changed = 1;
+                        }
+                }
+                if (!inode_count[i]) {
+                        if (!inode_in_use (i))
+                                continue;
+                        printf (_("Inode %d not used, marked used in the bitmap."), i);
+                        if (ask (_("Clear"), 1))
+                                unmark_inode (i);
+                        continue;
+                }
+                if (!inode_in_use (i)) {
+                        printf (_("Inode %d used, marked unused in the bitmap."), i);
+                        if (ask (_("Set"), 1))
+                                mark_inode (i);
+                }
+                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]);
+                        if (ask (_("Set i_nlinks to count"), 1)) {
+                                Inode2[i].i_nlinks = inode_count[i];
+                                changed = 1;
+                        }
+                }
+        }
+        for (i = FIRSTZONE; i < ZONES; i++) {
+                if (zone_in_use (i) == zone_count[i])
+                        continue;
+                if (!zone_count[i]) {
+                        if (bad_zone (i))
+                                continue;
+                        printf (_("Zone %d: marked in use, no file uses it."), i);
+                        if (ask (_("Unmark"), 1))
+                                unmark_zone (i);
+                        continue;
+                }
+                printf (_("Zone %d: %sin use, counted=%d\n"),
+                        i, zone_in_use (i) ? "" : _("not "), zone_count[i]);
+        }
+}
+#endif
+
+void check(void)
+{
+        memset(inode_count,0,(INODES + 1) * sizeof(*inode_count));
+        memset(zone_count,0,ZONES*sizeof(*zone_count));
+        check_zones(ROOT_INO);
+        recursive_check(ROOT_INO);
+        check_counts();
+}
+
+#ifdef HAVE_MINIX2
+void
+check2 (void)
+{
+        memset (inode_count, 0, (INODES + 1) * sizeof (*inode_count));
+        memset (zone_count, 0, ZONES * sizeof (*zone_count));
+        check_zones2 (ROOT_INO);
+        recursive_check2 (ROOT_INO);
+        check_counts2 ();
+}
+#endif
+
+extern int 
+fsck_minix_main(int argc, char ** argv)
+{
+        struct termios tmp;
+        int count;
+        int retcode = 0;
+
+        setlocale(LC_ALL, "");
+        bindtextdomain(PACKAGE, LOCALEDIR);
+        textdomain(PACKAGE);
+        
+
+        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 v2 inode size"));
+#endif
+        while (argc-- > 1) {
+                argv++;
+                if (argv[0][0] != '-') {
+                        if (device_name)
+                                usage();
+                        else
+                                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: usage();
+                        }
+        }
+        if (!device_name)
+                usage();
+        check_mount();          /* trying to check a mounted filesystem? */
+        if (repair && !automatic) {
+                if (!isatty(0) || !isatty(1))
+                        die(_("need terminal for interactive repairs"));
+        }
+        IN = open(device_name,repair?O_RDWR:O_RDONLY);
+        if (IN < 0)
+                die(_("unable to open '%s'"));
+        for (count=0 ; count<3 ; count++)
+                sync();
+        read_superblock();
+
+        /*
+         * Determine whether or not we should continue with the checking.
+         * This is based on the status of the filesystem valid and error
+         * flags and whether or not the -f switch was specified on the 
+         * command line.
+         */
+        printf("%s, %s / %s\n", program_name, program_version,
+               util_linux_version);
+        if ( !(Super.s_state & MINIX_ERROR_FS) && 
+              (Super.s_state & MINIX_VALID_FS) && 
+              !force ) {
+                if (repair)
+                        printf(_("%s is clean, no check.\n"), device_name);
+                return retcode;
+        }
+        else if (force)
+                printf(_("Forcing filesystem check on %s.\n"), device_name);
+        else if (repair)
+                printf(_("Filesystem on %s is dirty, needs checking.\n"),\
+                        device_name);
+
+        read_tables();
+
+        if (repair && !automatic) {
+                tcgetattr(0,&termios);
+                tmp = termios;
+                tmp.c_lflag &= ~(ICANON|ECHO);
+                tcsetattr(0,TCSANOW,&tmp);
+                termios_set = 1;
+        }
+
+#if HAVE_MINIX2
+        if (version2) {
+                check_root2 ();
+                check2 ();
+        } else 
+#endif
+          {
+                check_root();
+                check();
+        }
+        if (verbose) {
+                int i, free;
+
+                for (i=1,free=0 ; i <= INODES ; i++)
+                        if (!inode_in_use(i))
+                                free++;
+                printf(_("\n%6ld inodes used (%ld%%)\n"),(INODES-free),
+                        100*(INODES-free)/INODES);
+                for (i=FIRSTZONE,free=0 ; i < ZONES ; i++)
+                        if (!zone_in_use(i))
+                                free++;
+                printf(_("%6ld zones used (%ld%%)\n"),(ZONES-free),
+                        100*(ZONES-free)/ZONES);
+                printf(_("\n%6d regular files\n"
+                "%6d directories\n"
+                "%6d character device files\n"
+                "%6d block device files\n"
+                "%6d links\n"
+                "%6d symbolic links\n"
+                "------\n"
+                "%6d files\n"),
+                regular,directory,chardev,blockdev,
+                links-2*directory+1,symlinks,total-2*directory+1);
+        }
+        if (changed) {
+                write_tables();
+                printf(_(       "----------------------------\n"
+                        "FILE SYSTEM HAS BEEN CHANGED\n"
+                        "----------------------------\n"));
+                for (count=0 ; count<3 ; count++)
+                        sync();
+        }
+        else if ( repair )
+                write_super_block();
+        
+        if (repair && !automatic)
+                tcsetattr(0,TCSANOW,&termios);
+
+        if (changed)
+              retcode += 3;
+        if (errors_uncorrected)
+              retcode += 4;
+        return retcode;
+}
diff --git a/internal.h b/internal.h
index dedb9f193..ae0148b2e 100644
--- a/internal.h
+++ b/internal.h
@@ -70,6 +70,8 @@ extern int dutmp_main(int argc, char** argv);
 extern int false_main(int argc, char** argv);
 extern int fdisk_main(int argc, char** argv);
 extern int fdflush_main(int argc, char **argv);
+extern int fsck_minix_main(int argc, char **argv);
+extern int mkfs_minix_main(int argc, char **argv);
 extern int find_main(int argc, char** argv);
 extern int grep_main(int argc, char** argv);
 extern int halt_main(int argc, char** argv);
diff --git a/mkfs_minix.c b/mkfs_minix.c
new file mode 100644
index 000000000..7c8af7e1d
--- /dev/null
+++ b/mkfs_minix.c
@@ -0,0 +1,755 @@
+/*
+ * mkfs.c - make a linux (minix) file-system.
+ *
+ * (C) 1991 Linus Torvalds. This file may be redistributed as per
+ * the Linux copyright.
+ */
+
+/*
+ * DD.MM.YY
+ *
+ * 24.11.91  -  Time began. Used the fsck sources to get started.
+ *
+ * 25.11.91  -  Corrected some bugs. Added support for ".badblocks"
+ *              The algorithm for ".badblocks" is a bit weird, but
+ *              it should work. Oh, well.
+ *
+ * 25.01.92  -  Added the -l option for getting the list of bad blocks
+ *              out of a named file. (Dave Rivers, rivers@ponds.uucp)
+ *
+ * 28.02.92  -  Added %-information when using -c.
+ *
+ * 28.02.93  -  Added support for other namelengths than the original
+ *              14 characters so that I can test the new kernel routines..
+ *
+ * 09.10.93  -  Make exit status conform to that required by fsutil
+ *              (Rik Faith, faith@cs.unc.edu)
+ *
+ * 31.10.93  -  Added inode request feature, for backup floppies: use
+ *              32 inodes, for a news partition use more.
+ *              (Scott Heavner, sdh@po.cwru.edu)
+ *
+ * 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)
+ * 
+ * 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)
+ *
+ * 03.20.95  -  Clear first 512 bytes of filesystem to make certain that
+ *              the filesystem is not misidentified as a MS-DOS FAT filesystem.
+ *              (Daniel Quinlan, quinlan@yggdrasil.com)
+ *
+ * 02.07.96  -  Added small patch from Russell King to make the program a
+ *              good deal more portable (janl@math.uio.no)
+ *
+ * Usage:  mkfs [-c | -l filename ] [-v] [-nXX] [-iXX] device [size-in-blocks]
+ *
+ *      -c for readablility 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 :-). 
+ */
+
+#include <stdio.h>
+#include <time.h>
+#include <unistd.h>
+#include <string.h>
+#include <signal.h>
+#include <fcntl.h>
+#include <ctype.h>
+#include <stdlib.h>
+#include <termios.h>
+#include <sys/stat.h>
+#include <sys/ioctl.h>
+#include <mntent.h>
+#include <getopt.h>
+
+#include <linux/fs.h>
+#include <linux/minix_fs.h>
+
+#include "nls.h"
+#include "../version.h"
+
+#ifdef MINIX2_SUPER_MAGIC2
+#define HAVE_MINIX2 1
+#endif
+
+#ifndef __GNUC__
+#error "needs gcc for the bitop-__asm__'s"
+#endif
+
+#ifndef __linux__
+#define volatile
+#endif
+
+#define MINIX_ROOT_INO 1
+#define MINIX_BAD_INO 2
+
+#define TEST_BUFFER_BLOCKS 16
+#define MAX_GOOD_BLOCKS 512
+
+#define UPPER(size,n) (((size)+((n)-1))/(n))
+#define INODE_SIZE (sizeof(struct minix_inode))
+#ifdef HAVE_MINIX2
+#define INODE_SIZE2 (sizeof(struct minix2_inode))
+#define INODE_BLOCKS UPPER(INODES, (version2 ? MINIX2_INODES_PER_BLOCK \
+                                    : MINIX_INODES_PER_BLOCK))
+#else
+#define INODE_BLOCKS UPPER(INODES, (MINIX_INODES_PER_BLOCK))
+#endif
+#define INODE_BUFFER_SIZE (INODE_BLOCKS * BLOCK_SIZE)
+
+#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 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 dirsize = 32;
+static int magic = MINIX_SUPER_MAGIC2;
+static int version2 = 0;
+
+static char root_block[BLOCK_SIZE] = "\0";
+
+static char * inode_buffer = NULL;
+#define Inode (((struct minix_inode *) inode_buffer)-1)
+#ifdef HAVE_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))
+#else
+#define ZONES ((unsigned long)(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 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 = 0;
+static unsigned long req_nr_inodes = 0;
+
+#include "bitops.h"
+
+#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)))
+
+#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.
+ */
+volatile void fatal_error(const char * fmt_string,int status)
+{
+        fprintf(stderr,fmt_string,program_name,device_name);
+        exit(status);
+}
+
+volatile void die(char *str) {
+        fprintf(stderr, "%s: %s\n", program_name, str);
+        exit(8);
+}
+
+volatile void 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);
+}
+
+/*
+ * 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;
+
+        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;
+
+        die(_("%s is mounted; will not make a filesystem here!"));
+}
+
+static long valid_offset (int fd, int offset)
+{
+        char ch;
+
+        if (lseek (fd, offset, 0) < 0)
+                return 0;
+        if (read (fd, &ch, 1) < 1)
+                return 0;
+        return 1;
+}
+
+static int count_blocks (int fd)
+{
+        int high, low;
+
+        low = 0;
+        for (high = 1; valid_offset (fd, high); high *= 2)
+                low = high;
+        while (low < high - 1)
+        {
+                const int mid = (low + high) / 2;
+
+                if (valid_offset (fd, mid))
+                        low = mid;
+                else
+                        high = mid;
+        }
+        valid_offset (fd, 0);
+        return (low + 1);
+}
+
+static int get_size(const char  *file)
+{
+        int     fd;
+        long    size;
+
+        fd = open(file, O_RDWR);
+        if (fd < 0) {
+                perror(file);
+                exit(1);
+        }
+        if (ioctl(fd, BLKGETSIZE, &size) >= 0) {
+                close(fd);
+                return (size * 512);
+        }
+                
+        size = count_blocks(fd);
+        close(fd);
+        return size;
+}
+
+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"));
+        if (512 != write(DEV, boot_block_buffer, 512))
+                die(_("unable to clear boot sector"));
+        if (BLOCK_SIZE != lseek(DEV, BLOCK_SIZE, SEEK_SET))
+                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"));
+        
+}
+
+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 (BLOCK_SIZE != write(DEV, buffer, BLOCK_SIZE))
+                die(_("write failed in write_block"));
+}
+
+int get_free_block(void)
+{
+        int blk;
+
+        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;
+        else
+                blk = FIRSTZONE;
+        while (blk < ZONES && zone_in_use(blk))
+                blk++;
+        if (blk >= ZONES)
+                die(_("not enough good blocks"));
+        good_blocks_table[used_good_blocks] = blk;
+        used_good_blocks++;
+        return blk;
+}
+
+void mark_good_blocks(void)
+{
+        int 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;
+        while (++zone < ZONES)
+                if (zone_in_use(zone))
+                        return zone;
+        return 0;
+}
+
+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];
+
+#define NEXT_BAD (zone = next(zone))
+
+        if (!badblocks)
+                return;
+        mark_inode(MINIX_BAD_INO);
+        inode->i_nlinks = 1;
+        inode->i_time = time(NULL);
+        inode->i_mode = S_IFREG + 0000;
+        inode->i_size = badblocks*BLOCK_SIZE;
+        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);
+        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);
+                dind_block[i] = ind = get_free_block();
+                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:
+        if (ind)
+                write_block(ind, (char *) ind_block);
+        if (dind)
+                write_block(dind, (char *) dind_block);
+}
+
+#ifdef HAVE_MINIX2
+void
+make_bad_inode2 (void)
+{
+        struct minix2_inode *inode = &Inode2[MINIX_BAD_INO];
+        int i, j, zone;
+        int ind = 0, dind = 0;
+        unsigned long ind_block[BLOCK_SIZE >> 2];
+        unsigned long dind_block[BLOCK_SIZE >> 2];
+
+        if (!badblocks)
+                return;
+        mark_inode (MINIX_BAD_INO);
+        inode->i_nlinks = 1;
+        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);
+        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 < 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);
+        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);
+                for (j = 0; j < 256; j++) {
+                        ind_block[j] = zone;
+                        if (!NEXT_BAD)
+                                goto end_bad;
+                }
+        }
+        /* Could make triple indirect block here */
+        die (_("too many bad blocks"));
+ end_bad:
+        if (ind)
+                write_block (ind, (char *) ind_block);
+        if (dind)
+                write_block (dind, (char *) dind_block);
+}
+#endif
+
+void make_root_inode(void)
+{
+        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;
+        else {
+                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);
+}
+
+#ifdef HAVE_MINIX2
+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 ();
+        inode->i_nlinks = 2;
+        inode->i_atime = inode->i_mtime = inode->i_ctime = time (NULL);
+        if (badblocks)
+                inode->i_size = 3 * dirsize;
+        else {
+                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);
+}
+#endif
+
+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;
+        ZONES = 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
+        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) {
+                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++)
+                unmark_zone(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);
+}
+
+/*
+ * 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 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"));
+        }
+
+
+        /* 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"));
+        }
+        got /= BLOCK_SIZE;
+        return got;
+}
+
+static unsigned int currently_testing = 0;
+
+void alarm_intr(int alnum)
+{
+        if (currently_testing >= ZONES)
+                return;
+        signal(SIGALRM,alarm_intr);
+        alarm(5);
+        if (!currently_testing)
+                return;
+        printf("%d ...", currently_testing);
+        fflush(stdout);
+}
+
+void check_blocks(void)
+{
+        int try,got;
+        static char buffer[BLOCK_SIZE * TEST_BUFFER_BLOCKS];
+
+        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"));
+                try = TEST_BUFFER_BLOCKS;
+                if (currently_testing + try > ZONES)
+                        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"));
+                mark_zone(currently_testing);
+                badblocks++;
+                currently_testing++;
+        }
+        if (badblocks > 1)
+                printf(_("%d bad blocks\n"), badblocks);
+        else if (badblocks == 1)
+                printf(_("one bad block\n"));
+}
+
+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"));
+}
+
+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"));
+#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;
+#else
+        fatal_error(_("%s: not compiled with minix v2 support\n"),-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
+#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
+#endif
+    {
+      make_root_inode();
+      make_bad_inode();
+    }
+  mark_good_blocks();
+  write_tables();
+  return 0;
+}
diff --git a/util-linux/fsck_minix.c b/util-linux/fsck_minix.c
new file mode 100644
index 000000000..e4b14d705
--- /dev/null
+++ b/util-linux/fsck_minix.c
@@ -0,0 +1,1377 @@
+/*
+ * fsck.c - a file system consistency checker for Linux.
+ *
+ * (C) 1991, 1992 Linus Torvalds. This file may be redistributed
+ * as per the GNU copyleft.
+ */
+
+/*
+ * 09.11.91  -  made the first rudimetary functions
+ *
+ * 10.11.91  -  updated, does checking, no repairs yet.
+ *              Sent out to the mailing-list for testing.
+ *
+ * 14.11.91  -  Testing seems to have gone well. Added some
+ *              correction-code, and changed some functions.
+ *
+ * 15.11.91  -  More correction code. Hopefully it notices most
+ *              cases now, and tries to do something about them.
+ *
+ * 16.11.91  -  More corrections (thanks to Mika Jalava). Most
+ *              things seem to work now. Yeah, sure.
+ *
+ *
+ * 19.04.92  -  Had to start over again from this old version, as a
+ *              kernel bug ate my enhanced fsck in february.
+ *
+ * 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
+ *
+ * Sat Oct  9 11:17:11 1993, faith@cs.unc.edu: make exit status conform
+ *                           to that required by fsutil
+ *
+ * Mon Jan  3 11:06:52 1994 - Dr. Wettstein (greg%wind.uucp@plains.nodak.edu)
+ *                            Added support for file system valid flag.  Also
+ *                            added program_version variable and output of
+ *                            program name and version number when program
+ *                            is executed.
+ *
+ * 30.10.94 - added support for v2 filesystem
+ *            (Andreas Schwab, schwab@issan.informatik.uni-dortmund.de)
+ *
+ * 10.12.94  -  added test to prevent checking of mounted fs adapted
+ *              from Theodore Ts'o's (tytso@athena.mit.edu) e2fsck
+ *              program.  (Daniel Quinlan, quinlan@yggdrasil.com)
+ *
+ * 01.07.96  - Fixed the v2 fs stuff to use the right #defines and such
+ *             for modern libcs (janl@math.uio.no, Nicolai Langfeldt)
+ *
+ * 02.07.96  - Added C bit fiddling routines from rmk@ecs.soton.ac.uk 
+ *             (Russell King).  He made them for ARM.  It would seem
+ *             that the ARM is powerful enough to do this in C whereas
+ *             i386 and m64k must use assembly to get it fast >:-)
+ *             This should make minix fsck systemindependent.
+ *             (janl@math.uio.no, Nicolai Langfeldt)
+ *
+ * 04.11.96  - Added minor fixes from Andreas Schwab to avoid compiler
+ *             warnings.  Added mc68k bitops from 
+ *             Joerg Dorchain <dorchain@mpi-sb.mpg.de>.
+ *
+ * 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>
+ * - added Native Language Support
+ *
+ *
+ * I've had no time to add comments - hopefully the function names
+ * are comments enough. As with all file system checkers, this assumes
+ * the file system is quiescent - don't use it on a mounted device
+ * unless you can be sure nobody is writing to it (and remember that the
+ * kernel can write to it when it searches for files).
+ *
+ * Usuage: fsck [-larvsm] device
+ *      -l for a listing of all the filenames
+ *      -a for automatic repairs (not implemented)
+ *      -r for repairs (interactive) (not implemented)
+ *      -v for verbose (tells how many files)
+ *      -s for super-block info
+ *      -m for minix-like "mode not cleared" warnings
+ *      -f force filesystem check even if filesystem marked as valid
+ *
+ * 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 :-). 
+ */
+
+#include <stdio.h>
+#include <errno.h>
+#include <unistd.h>
+#include <string.h>
+#include <fcntl.h>
+#include <ctype.h>
+#include <stdlib.h>
+#include <termios.h>
+#include <mntent.h>
+#include <sys/stat.h>
+
+#include <linux/fs.h>
+#include <linux/minix_fs.h>
+#include "../version.h"
+#include "nls.h"
+
+#ifdef MINIX2_SUPER_MAGIC2
+#define HAVE_MINIX2 1
+#endif
+
+#ifndef __linux__
+#define volatile
+#endif
+
+#define ROOT_INO 1
+
+#define UPPER(size,n) ((size+((n)-1))/(n))
+#define INODE_SIZE (sizeof(struct minix_inode))
+#ifdef HAVE_MINIX2
+#define INODE_SIZE2 (sizeof(struct minix2_inode))
+#define INODE_BLOCKS UPPER(INODES, (version2 ? MINIX2_INODES_PER_BLOCK \
+                                    : MINIX_INODES_PER_BLOCK))
+#else
+#define INODE_BLOCKS UPPER(INODES, (MINIX_INODES_PER_BLOCK))
+#endif
+#define INODE_BUFFER_SIZE (INODE_BLOCKS * BLOCK_SIZE)
+
+#define BITS_PER_BLOCK (BLOCK_SIZE<<3)
+
+static char * program_name = "fsck.minix";
+static char * program_version = "1.2 - 11/11/96";
+static char * device_name = NULL;
+static int IN;
+static int repair=0, automatic=0, verbose=0, list=0, show=0, warn_mode=0, 
+        force=0;
+static int directory=0, regular=0, blockdev=0, chardev=0, links=0,
+                symlinks=0, total=0;
+
+static int changed = 0; /* flags if the filesystem has been changed */
+static int errors_uncorrected = 0; /* flag if some error was not corrected */
+static int dirsize = 16;
+static int namelen = 14;
+static int version2 = 0;
+static struct termios termios;
+static int termios_set = 0;
+
+/* File-name data */
+#define MAX_DEPTH 50
+static int name_depth = 0;
+static char name_list[MAX_DEPTH][NAME_MAX+1];
+
+static char * inode_buffer = NULL;
+#define Inode (((struct minix_inode *) inode_buffer)-1)
+#define Inode2 (((struct minix2_inode *) inode_buffer)-1)
+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
+#define ZONES ((unsigned long)(version2 ? Super.s_zones : Super.s_nzones))
+#else
+#define ZONES ((unsigned long)(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 MAGIC (Super.s_magic)
+#define NORM_FIRSTZONE (2+IMAPS+ZMAPS+INODE_BLOCKS)
+
+static char *inode_map;
+static char *zone_map;
+
+static unsigned char * inode_count = NULL;
+static unsigned char * zone_count = NULL;
+
+void recursive_check(unsigned int ino);
+void recursive_check2(unsigned int ino);
+
+#include "bitops.h"
+
+#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)),changed=1)
+#define unmark_inode(x) (clrbit(inode_map,(x)),changed=1)
+
+#define mark_zone(x) (setbit(zone_map,(x)-FIRSTZONE+1),changed=1)
+#define unmark_zone(x) (clrbit(zone_map,(x)-FIRSTZONE+1),changed=1)
+
+void leave(int) __attribute__ ((noreturn));
+void leave(int status)
+{
+        if (termios_set)
+                tcsetattr(0, TCSANOW, &termios);
+        exit(status);
+}
+
+void usage(void) {
+        fprintf(stderr,
+                _("Usage: %s [-larvsmf] /dev/name\n"),
+                program_name);
+        leave(16);
+}
+
+void die(const char *str) {
+        fprintf(stderr, "%s: %s\n", program_name, str);
+        leave(8);
+}
+
+/*
+ * This simply goes through the file-name data and prints out the
+ * current file.
+ */
+void print_current_name(void)
+{
+        int i=0;
+
+        while (i<name_depth)
+                printf("/%.*s",namelen,name_list[i++]);
+        if (i == 0)
+                printf ("/");
+}
+
+int ask(const char * string, int def)
+{
+        int c;
+
+        if (!repair) {
+                printf("\n");
+                errors_uncorrected = 1;
+                return 0;
+        }
+        if (automatic) {
+                printf("\n");
+                if (!def)
+                      errors_uncorrected = 1;
+                return def;
+        }
+        printf(def?"%s (y/n)? ":"%s (n/y)? ",string);
+        for (;;) {
+                fflush(stdout);
+                if ((c=getchar())==EOF) {
+                        if (!def)
+                              errors_uncorrected = 1;
+                        return def;
+                }
+                c=toupper(c);
+                if (c == 'Y') {
+                        def = 1;
+                        break;
+                } else if (c == 'N') {
+                        def = 0;
+                        break;
+                } else if (c == ' ' || c == '\n')
+                        break;
+        }
+        if (def)
+                printf("y\n");
+        else {
+                printf("n\n");
+                errors_uncorrected = 1;
+             }
+        return def;
+}
+
+/*
+ * Make certain that we aren't checking a filesystem that is on a
+ * mounted partition.  Code adapted from e2fsck, Copyright (C) 1993,
+ * 1994 Theodore Ts'o.  Also licensed under GPL.
+ */
+static void check_mount(void)
+{
+        FILE * f;
+        struct mntent * mnt;
+        int cont;
+        int fd;
+
+        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;
+
+        /*
+         * If the root is mounted read-only, then /etc/mtab is
+         * probably not correct; so we won't issue a warning based on
+         * it.
+         */
+        fd = open(MOUNTED, O_RDWR);
+        if (fd < 0 && errno == EROFS)
+                return;
+        else
+                close(fd);
+        
+        printf (_("%s is mounted.        "), device_name);
+        if (isatty(0) && isatty(1))
+                cont = ask(_("Do you really want to continue"), 0);
+        else
+                cont = 0;
+        if (!cont) {
+                printf (_("check aborted.\n"));
+                exit (0);
+        }
+        return;
+}
+
+/*
+ * check_zone_nr checks to see that *nr is a valid zone nr. If it
+ * isn't, it will possibly be repaired. Check_zone_nr sets *corrected
+ * if an error was corrected, and returns the zone (0 for no zone
+ * or a bad zone-number).
+ */
+int check_zone_nr(unsigned short * nr, int * corrected)
+{
+        if (!*nr)
+                return 0;
+        if (*nr < FIRSTZONE)
+                printf(_("Zone nr < FIRSTZONE in file `"));
+        else if (*nr >= ZONES)
+                printf(_("Zone nr >= ZONES in file `"));
+        else
+                return *nr;
+        print_current_name();
+        printf("'.");
+        if (ask(_("Remove block"),1)) {
+                *nr = 0;
+                *corrected = 1;
+        }
+        return 0;
+}
+
+#ifdef HAVE_MINIX2
+int check_zone_nr2 (unsigned int *nr, int *corrected)
+{
+        if (!*nr)
+                return 0;
+        if (*nr < FIRSTZONE)
+                printf (_("Zone nr < FIRSTZONE in file `"));
+        else if (*nr >= ZONES)
+                printf (_("Zone nr >= ZONES in file `"));
+        else
+                return *nr;
+        print_current_name ();
+        printf ("'.");
+        if (ask (_("Remove block"), 1)) {
+                *nr = 0;
+                *corrected = 1;
+        }
+        return 0;
+}
+#endif
+
+/*
+ * read-block reads block nr into the buffer at addr.
+ */
+void read_block(unsigned int nr, char * addr)
+{
+        if (!nr) {
+                memset(addr,0,BLOCK_SIZE);
+                return;
+        }
+        if (BLOCK_SIZE*nr != lseek(IN, BLOCK_SIZE*nr, SEEK_SET)) {
+                printf(_("Read error: unable to seek to block in file '"));
+                print_current_name();
+                printf("'\n");
+                memset(addr,0,BLOCK_SIZE);
+                errors_uncorrected = 1;
+        } else if (BLOCK_SIZE != read(IN, addr, BLOCK_SIZE)) {
+                printf(_("Read error: bad block in file '"));
+                print_current_name();
+                printf("'\n");
+                memset(addr,0,BLOCK_SIZE);
+                errors_uncorrected = 1;
+        }
+}
+
+/*
+ * write_block writes block nr to disk.
+ */
+void write_block(unsigned int nr, char * addr)
+{
+        if (!nr)
+                return;
+        if (nr < FIRSTZONE || nr >= ZONES) {
+                printf(_("Internal error: trying to write bad block\n"
+                "Write request ignored\n"));
+                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(_("Write error: bad block in file '"));
+                print_current_name();
+                printf("'\n");
+                errors_uncorrected = 1;
+        }
+}
+
+/*
+ * map-block calculates the absolute block nr of a block in a file.
+ * It sets 'changed' if the inode has needed changing, and re-writes
+ * any indirect blocks with errors.
+ */
+int map_block(struct minix_inode * inode, unsigned int blknr)
+{
+        unsigned short ind[BLOCK_SIZE>>1];
+        unsigned short dind[BLOCK_SIZE>>1];
+        int blk_chg, block, result;
+
+        if (blknr<7)
+                return check_zone_nr(inode->i_zone + blknr, &changed);
+        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;
+        }
+        blknr -= 512;
+        block = check_zone_nr(inode->i_zone + 8, &changed);
+        read_block(block, (char *) dind);
+        blk_chg = 0;
+        result = check_zone_nr(dind + (blknr/512), &blk_chg);
+        if (blk_chg)
+                write_block(block, (char *) dind);
+        block = result;
+        read_block(block, (char *) ind);
+        blk_chg = 0;
+        result = check_zone_nr(ind + (blknr%512), &blk_chg);
+        if (blk_chg)
+                write_block(block, (char *) ind);
+        return result;
+}
+
+#ifdef HAVE_MINIX2
+int map_block2 (struct minix2_inode *inode, unsigned int blknr)
+{
+        unsigned int ind[BLOCK_SIZE >> 2];
+        unsigned int dind[BLOCK_SIZE >> 2];
+        unsigned int tind[BLOCK_SIZE >> 2];
+        int blk_chg, block, result;
+
+        if (blknr < 7)
+                return check_zone_nr2 (inode->i_zone + blknr, &changed);
+        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;
+        }
+        blknr -= 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;
+        }
+        blknr -= 256 * 256;
+        block = check_zone_nr2 (inode->i_zone + 9, &changed);
+        read_block (block, (char *) tind);
+        blk_chg = 0;
+        result = check_zone_nr2 (tind + blknr / (256 * 256), &blk_chg);
+        if (blk_chg)
+                write_block (block, (char *) tind);
+        block = result;
+        read_block (block, (char *) dind);
+        blk_chg = 0;
+        result = check_zone_nr2 (dind + (blknr / 256) % 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;
+}
+#endif
+
+void write_super_block(void)
+{
+        /*
+         * Set the state of the filesystem based on whether or not there
+         * are uncorrected errors.  The filesystem valid flag is
+         * unconditionally set if we get this far.
+         */
+        Super.s_state |= MINIX_VALID_FS;
+        if ( errors_uncorrected )
+                Super.s_state |= MINIX_ERROR_FS;
+        else
+                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(_("unable to write super-block"));
+
+        return;
+}
+
+void write_tables(void)
+{
+        write_super_block();
+
+        if (IMAPS*BLOCK_SIZE != write(IN,inode_map,IMAPS*BLOCK_SIZE))
+                die(_("Unable to write inode map"));
+        if (ZMAPS*BLOCK_SIZE != write(IN,zone_map,ZMAPS*BLOCK_SIZE))
+                die(_("Unable to write zone map"));
+        if (INODE_BUFFER_SIZE != write(IN,inode_buffer,INODE_BUFFER_SIZE))
+                die(_("Unable to write inodes"));
+}
+
+void get_dirsize (void)
+{
+        int block;
+        char blk[BLOCK_SIZE];
+        int size;
+
+#if HAVE_MINIX2
+        if (version2)
+                block = Inode2[ROOT_INO].i_zone[0];
+        else
+#endif
+                block = Inode[ROOT_INO].i_zone[0];
+        read_block (block, blk);
+        for (size = 16; size < BLOCK_SIZE; size <<= 1) {
+                if (strcmp (blk + size + 2, "..") == 0) {
+                        dirsize = size;
+                        namelen = size - 2;
+                        return;
+                }
+        }
+        /* use defaults */
+}
+
+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(_("unable to read super block"));
+        if (MAGIC == MINIX_SUPER_MAGIC) {
+                namelen = 14;
+                dirsize = 16;
+                version2 = 0;
+        } else if (MAGIC == MINIX_SUPER_MAGIC2) {
+                namelen = 30;
+                dirsize = 32;
+                version2 = 0;
+#ifdef HAVE_MINIX2
+        } else if (MAGIC == MINIX2_SUPER_MAGIC) {
+                namelen = 14;
+                dirsize = 16;
+                version2 = 1;
+        } else if (MAGIC == MINIX2_SUPER_MAGIC2) {
+                namelen = 30;
+                dirsize = 32;
+                version2 = 1;
+#endif
+        } else
+                die(_("bad magic number in super-block"));
+        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"));
+        if (ZMAPS * BLOCK_SIZE * 8 < ZONES - FIRSTZONE + 1)
+                die(_("bad s_zmap_blocks field in super-block"));
+}
+
+void read_tables(void)
+{
+        inode_map = malloc(IMAPS * BLOCK_SIZE);
+        if (!inode_map)
+                die(_("Unable to allocate buffer for inode map"));
+        zone_map = malloc(ZMAPS * BLOCK_SIZE);
+        if (!inode_map)
+                die("Unable to allocate buffer for zone map");
+        memset(inode_map,0,sizeof(inode_map));
+        memset(zone_map,0,sizeof(zone_map));
+        inode_buffer = malloc(INODE_BUFFER_SIZE);
+        if (!inode_buffer)
+                die(_("Unable to allocate buffer for inodes"));
+        inode_count = malloc(INODES + 1);
+        if (!inode_count)
+                die(_("Unable to allocate buffer for inode count"));
+        zone_count = malloc(ZONES);
+        if (!zone_count)
+                die(_("Unable to allocate buffer for zone count"));
+        if (IMAPS*BLOCK_SIZE != read(IN,inode_map,IMAPS*BLOCK_SIZE))
+                die(_("Unable to read inode map"));
+        if (ZMAPS*BLOCK_SIZE != read(IN,zone_map,ZMAPS*BLOCK_SIZE))
+                die(_("Unable to read zone map"));
+        if (INODE_BUFFER_SIZE != read(IN,inode_buffer,INODE_BUFFER_SIZE))
+                die(_("Unable to read inodes"));
+        if (NORM_FIRSTZONE != FIRSTZONE) {
+                printf(_("Warning: Firstzone != Norm_firstzone\n"));
+                errors_uncorrected = 1;
+        }
+        get_dirsize ();
+        if (show) {
+                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"),MAXSIZE);
+                printf(_("Filesystem state=%d\n"), Super.s_state);
+                printf(_("namelen=%d\n\n"),namelen);
+        }
+}
+
+struct minix_inode * get_inode(unsigned int nr)
+{
+        struct minix_inode * inode;
+
+        if (!nr || nr > INODES)
+                return NULL;
+        total++;
+        inode = Inode + nr;
+        if (!inode_count[nr]) {
+                if (!inode_in_use(nr)) {
+                        printf(_("Inode %d marked not used, but used for file '"),
+                                nr);
+                        print_current_name();
+                        printf("'\n");
+                        if (repair) {
+                                if (ask(_("Mark 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 {
+                        print_current_name();
+                        printf(_(" has mode %05o\n"),inode->i_mode);
+                }
+
+        } else
+                links++;
+        if (!++inode_count[nr]) {
+                printf(_("Warning: inode count too big.\n"));
+                inode_count[nr]--;
+                errors_uncorrected = 1;
+        }
+        return inode;
+}
+
+#ifdef HAVE_MINIX2
+struct minix2_inode *
+get_inode2 (unsigned int nr)
+{
+        struct minix2_inode *inode;
+
+        if (!nr || nr > INODES)
+                return NULL;
+        total++;
+        inode = Inode2 + nr;
+        if (!inode_count[nr]) {
+                if (!inode_in_use (nr)) {
+                        printf (_("Inode %d marked not used, but used for file '"), nr);
+                        print_current_name ();
+                        printf ("'\n");
+                        if (repair) {
+                                if (ask (_("Mark 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 {
+                        print_current_name ();
+                        printf (_(" has mode %05o\n"), inode->i_mode);
+                }
+        } else
+                links++;
+        if (!++inode_count[nr]) {
+                printf (_("Warning: inode count too big.\n"));
+                inode_count[nr]--;
+                errors_uncorrected = 1;
+        }
+        return inode;
+}
+#endif
+
+void check_root(void)
+{
+        struct minix_inode * inode = Inode + ROOT_INO;
+
+        if (!inode || !S_ISDIR(inode->i_mode))
+                die(_("root inode isn't a directory"));
+}
+
+#ifdef HAVE_MINIX2
+void check_root2 (void)
+{
+        struct minix2_inode *inode = Inode2 + ROOT_INO;
+
+        if (!inode || !S_ISDIR (inode->i_mode))
+                die ("root inode isn't a directory");
+}
+#endif
+
+static int add_zone(unsigned short * znr, int * corrected)
+{
+        int result;
+        int block;
+
+        result = 0;
+        block = check_zone_nr(znr, corrected);
+        if (!block)
+                return 0;
+        if (zone_count[block]) {
+                printf(_("Block has been used before. Now in file `"));
+                print_current_name();
+                printf("'.");
+                if (ask(_("Clear"),1)) {
+                        *znr = 0;
+                        block = 0;
+                        *corrected = 1;
+                }
+        }
+        if (!block)
+                return 0;
+        if (!zone_in_use(block)) {
+                printf(_("Block %d in file `"),block);
+                print_current_name();
+                printf(_("' is marked not in use."));
+                if (ask(_("Correct"),1))
+                        mark_zone(block);
+        }
+        if (!++zone_count[block])
+                zone_count[block]--;
+        return block;
+}
+
+#ifdef HAVE_MINIX2
+static int add_zone2 (unsigned int *znr, int *corrected)
+{
+        int result;
+        int block;
+
+        result = 0;
+        block = check_zone_nr2 (znr, corrected);
+        if (!block)
+                return 0;
+        if (zone_count[block]) {
+                printf (_("Block has been used before. Now in file `"));
+                print_current_name ();
+                printf ("'.");
+                if (ask (_("Clear"), 1)) {
+                        *znr = 0;
+                        block = 0;
+                        *corrected = 1;
+                }
+        }
+        if (!block)
+                return 0;
+        if (!zone_in_use (block)) {
+                printf (_("Block %d in file `"), block);
+                print_current_name ();
+                printf (_("' is marked not in use."));
+                if (ask (_("Correct"), 1))
+                        mark_zone (block);
+        }
+        if (!++zone_count[block])
+                zone_count[block]--;
+        return block;
+}
+#endif
+
+static void add_zone_ind(unsigned short * znr, int * corrected)
+{
+        static char blk[BLOCK_SIZE];
+        int i, chg_blk=0;
+        int block;
+
+        block = add_zone(znr, corrected);
+        if (!block)
+                return;
+        read_block(block, blk);
+        for (i=0 ; i < (BLOCK_SIZE>>1) ; i++)
+                add_zone(i + (unsigned short *) blk, &chg_blk);
+        if (chg_blk)
+                write_block(block, blk);
+}
+
+#ifdef HAVE_MINIX2
+static void
+add_zone_ind2 (unsigned int *znr, int *corrected)
+{
+        static char blk[BLOCK_SIZE];
+        int i, chg_blk = 0;
+        int block;
+
+        block = add_zone2 (znr, corrected);
+        if (!block)
+                return;
+        read_block (block, blk);
+        for (i = 0; i < BLOCK_SIZE >> 2; i++)
+                add_zone2 (i + (unsigned int *) blk, &chg_blk);
+        if (chg_blk)
+                write_block (block, blk);
+}
+#endif
+
+static void add_zone_dind(unsigned short * znr, int * corrected)
+{
+        static char blk[BLOCK_SIZE];
+        int i, blk_chg=0;
+        int block;
+
+        block = add_zone(znr, corrected);
+        if (!block)
+                return;
+        read_block(block, blk);
+        for (i=0 ; i < (BLOCK_SIZE>>1) ; i++)
+                add_zone_ind(i + (unsigned short *) blk, &blk_chg);
+        if (blk_chg)
+                write_block(block, blk);
+}
+
+#ifdef HAVE_MINIX2
+static void
+add_zone_dind2 (unsigned int *znr, int *corrected)
+{
+        static char blk[BLOCK_SIZE];
+        int i, blk_chg = 0;
+        int block;
+
+        block = add_zone2 (znr, corrected);
+        if (!block)
+                return;
+        read_block (block, blk);
+        for (i = 0; i < BLOCK_SIZE >> 2; i++)
+                add_zone_ind2 (i + (unsigned int *) blk, &blk_chg);
+        if (blk_chg)
+                write_block (block, blk);
+}
+
+static void
+add_zone_tind2 (unsigned int *znr, int *corrected)
+{
+        static char blk[BLOCK_SIZE];
+        int i, blk_chg = 0;
+        int block;
+
+        block = add_zone2 (znr, corrected);
+        if (!block)
+                return;
+        read_block (block, blk);
+        for (i = 0; i < BLOCK_SIZE >> 2; i++)
+                add_zone_dind2 (i + (unsigned int *) blk, &blk_chg);
+        if (blk_chg)
+                write_block (block, blk);
+}
+#endif
+
+void check_zones(unsigned int i)
+{
+        struct minix_inode * inode;
+
+        if (!i || i > INODES)
+                return;
+        if (inode_count[i] > 1) /* have we counted this file already? */
+                return;
+        inode = Inode + i;
+        if (!S_ISDIR(inode->i_mode) && !S_ISREG(inode->i_mode) &&
+            !S_ISLNK(inode->i_mode))
+                return;
+        for (i=0 ; i<7 ; i++)
+                add_zone(i + inode->i_zone, &changed);
+        add_zone_ind(7 + inode->i_zone, &changed);
+        add_zone_dind(8 + inode->i_zone, &changed);
+}
+
+#ifdef HAVE_MINIX2
+void
+check_zones2 (unsigned int i)
+{
+        struct minix2_inode *inode;
+
+        if (!i || i > INODES)
+                return;
+        if (inode_count[i] > 1) /* have we counted this file already? */
+                return;
+        inode = Inode2 + i;
+        if (!S_ISDIR (inode->i_mode) && !S_ISREG (inode->i_mode)
+            && !S_ISLNK (inode->i_mode))
+                return;
+        for (i = 0; i < 7; i++)
+                add_zone2 (i + inode->i_zone, &changed);
+        add_zone_ind2 (7 + inode->i_zone, &changed);
+        add_zone_dind2 (8 + inode->i_zone, &changed);
+        add_zone_tind2 (9 + inode->i_zone, &changed);
+}
+#endif
+
+void check_file(struct minix_inode * dir, unsigned int offset)
+{
+        static char blk[BLOCK_SIZE];
+        struct minix_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;
+        ino = * (unsigned short *) (name-2);
+        if (ino > INODES) {
+                print_current_name();
+                printf(_(" contains a bad inode number for file '"));
+                printf("%.*s'.",namelen,name);
+                if (ask(_(" Remove"),1)) {
+                        *(unsigned short *)(name-2) = 0;
+                        write_block(block, blk);
+                }
+                ino = 0;
+        }       
+        if (name_depth < MAX_DEPTH)
+                strncpy (name_list[name_depth], name, namelen);
+        name_depth++;
+        inode = get_inode(ino);
+        name_depth--;
+        if (!offset) {
+                if (!inode || strcmp(".",name)) {
+                        print_current_name();
+                        printf(_(": bad directory: '.' isn't first\n"));
+                        errors_uncorrected = 1;
+                } else return;
+        }
+        if (offset == dirsize) {
+                if (!inode || strcmp("..",name)) {
+                        print_current_name();
+                        printf(_(": bad directory: '..' isn't second\n"));
+                        errors_uncorrected = 1;
+                } else return;
+        }
+        if (!inode)
+                return;
+        if (name_depth < MAX_DEPTH)
+                strncpy(name_list[name_depth],name,namelen);
+        name_depth++;   
+        if (list) {
+                if (verbose)
+                        printf("%6d %07o %3d ",ino,inode->i_mode,inode->i_nlinks);
+                print_current_name();
+                if (S_ISDIR(inode->i_mode))
+                        printf(":\n");
+                else
+                        printf("\n");
+        }
+        check_zones(ino);
+        if (inode && S_ISDIR(inode->i_mode))
+                recursive_check(ino);
+        name_depth--;
+        return;
+}
+
+#ifdef HAVE_MINIX2
+void
+check_file2 (struct minix2_inode *dir, unsigned int 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;
+        ino = *(unsigned short *) (name - 2);
+        if (ino > INODES) {
+                print_current_name ();
+                printf (_(" contains a bad inode number for file '"));
+                printf ("%.*s'.", namelen, name);
+                if (ask (_(" Remove"), 1)) {
+                        *(unsigned short *) (name - 2) = 0;
+                        write_block (block, blk);
+                }
+                ino = 0;
+        }
+        if (name_depth < MAX_DEPTH)
+                strncpy (name_list[name_depth], name, namelen);
+        name_depth++;
+        inode = get_inode2 (ino);
+        name_depth--;
+        if (!offset) {
+                if (!inode || strcmp (".", name)) {
+                        print_current_name ();
+                        printf (_(": bad directory: '.' isn't first\n"));
+                        errors_uncorrected = 1;
+                } else
+                        return;
+        }
+        if (offset == dirsize) {
+                if (!inode || strcmp ("..", name)) {
+                        print_current_name ();
+                        printf (_(": bad directory: '..' isn't second\n"));
+                        errors_uncorrected = 1;
+                } else
+                        return;
+        }
+        if (!inode)
+                return;
+        name_depth++;
+        if (list) {
+                if (verbose)
+                        printf ("%6d %07o %3d ", ino, inode->i_mode, inode->i_nlinks);
+                print_current_name ();
+                if (S_ISDIR (inode->i_mode))
+                        printf (":\n");
+                else
+                        printf ("\n");
+        }
+        check_zones2 (ino);
+        if (inode && S_ISDIR (inode->i_mode))
+                recursive_check2 (ino);
+        name_depth--;
+        return;
+}
+#endif
+
+void recursive_check(unsigned int ino)
+{
+        struct minix_inode * dir;
+        unsigned int offset;
+
+        dir = Inode + ino;
+        if (!S_ISDIR(dir->i_mode))
+                die(_("internal error"));
+        if (dir->i_size < 2 * dirsize) {
+                print_current_name();
+                printf(_(": bad directory: size<32"));
+                errors_uncorrected = 1;
+        }
+        for (offset = 0 ; offset < dir->i_size ; offset += dirsize)
+                check_file(dir,offset);
+}
+
+#ifdef HAVE_MINIX2
+void
+recursive_check2 (unsigned int ino)
+{
+        struct minix2_inode *dir;
+        unsigned int offset;
+
+        dir = Inode2 + ino;
+        if (!S_ISDIR (dir->i_mode))
+                die ("internal error");
+        if (dir->i_size < 2 * dirsize) {
+                print_current_name ();
+                printf (_(": bad directory: size < 32"));
+                errors_uncorrected = 1;
+        }
+        for (offset = 0; offset < dir->i_size; offset += dirsize)
+                check_file2 (dir, offset);
+}
+#endif
+
+int bad_zone(int i)
+{
+        char buffer[1024];
+
+        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));
+}
+
+void check_counts(void)
+{
+        int i;
+
+        for (i=1 ; i <= INODES ; i++) {
+                if (!inode_in_use(i) && Inode[i].i_mode && warn_mode) {
+                        printf(_("Inode %d mode not cleared."),i);
+                        if (ask(_("Clear"),1)) {
+                                Inode[i].i_mode = 0;
+                                changed = 1;
+                        }
+                }
+                if (!inode_count[i]) {
+                        if (!inode_in_use(i))
+                                continue;
+                        printf(_("Inode %d not used, marked used in the bitmap."),i);
+                        if (ask(_("Clear"),1))
+                                unmark_inode(i);
+                        continue;
+                }
+                if (!inode_in_use(i)) {
+                        printf(_("Inode %d used, marked unused in the bitmap."),
+                                i);
+                        if (ask("Set",1))
+                                mark_inode(i);
+                }
+                if (Inode[i].i_nlinks != inode_count[i]) {
+                        printf(_("Inode %d (mode = %07o), i_nlinks=%d, counted=%d."),
+                                i,Inode[i].i_mode,Inode[i].i_nlinks,inode_count[i]);
+                        if (ask(_("Set i_nlinks to count"),1)) {
+                                Inode[i].i_nlinks=inode_count[i];
+                                changed=1;
+                        }
+                }
+        }
+        for (i=FIRSTZONE ; i < ZONES ; i++) {
+                if (zone_in_use(i) == zone_count[i])
+                        continue;
+                if (!zone_count[i]) {
+                        if (bad_zone(i))
+                                continue;
+                        printf(_("Zone %d: marked in use, no file uses it."),i);
+                        if (ask(_("Unmark"),1))
+                                unmark_zone(i);
+                        continue;
+                }
+                printf(_("Zone %d: %sin use, counted=%d\n"),
+                i,zone_in_use(i)?"":_("not "),zone_count[i]);
+        }
+}
+
+#ifdef HAVE_MINIX2
+void
+check_counts2 (void)
+{
+        int i;
+
+        for (i = 1; i <= INODES; i++) {
+                if (!inode_in_use (i) && Inode2[i].i_mode && warn_mode) {
+                        printf (_("Inode %d mode not cleared."), i);
+                        if (ask (_("Clear"), 1)) {
+                                Inode2[i].i_mode = 0;
+                                changed = 1;
+                        }
+                }
+                if (!inode_count[i]) {
+                        if (!inode_in_use (i))
+                                continue;
+                        printf (_("Inode %d not used, marked used in the bitmap."), i);
+                        if (ask (_("Clear"), 1))
+                                unmark_inode (i);
+                        continue;
+                }
+                if (!inode_in_use (i)) {
+                        printf (_("Inode %d used, marked unused in the bitmap."), i);
+                        if (ask (_("Set"), 1))
+                                mark_inode (i);
+                }
+                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]);
+                        if (ask (_("Set i_nlinks to count"), 1)) {
+                                Inode2[i].i_nlinks = inode_count[i];
+                                changed = 1;
+                        }
+                }
+        }
+        for (i = FIRSTZONE; i < ZONES; i++) {
+                if (zone_in_use (i) == zone_count[i])
+                        continue;
+                if (!zone_count[i]) {
+                        if (bad_zone (i))
+                                continue;
+                        printf (_("Zone %d: marked in use, no file uses it."), i);
+                        if (ask (_("Unmark"), 1))
+                                unmark_zone (i);
+                        continue;
+                }
+                printf (_("Zone %d: %sin use, counted=%d\n"),
+                        i, zone_in_use (i) ? "" : _("not "), zone_count[i]);
+        }
+}
+#endif
+
+void check(void)
+{
+        memset(inode_count,0,(INODES + 1) * sizeof(*inode_count));
+        memset(zone_count,0,ZONES*sizeof(*zone_count));
+        check_zones(ROOT_INO);
+        recursive_check(ROOT_INO);
+        check_counts();
+}
+
+#ifdef HAVE_MINIX2
+void
+check2 (void)
+{
+        memset (inode_count, 0, (INODES + 1) * sizeof (*inode_count));
+        memset (zone_count, 0, ZONES * sizeof (*zone_count));
+        check_zones2 (ROOT_INO);
+        recursive_check2 (ROOT_INO);
+        check_counts2 ();
+}
+#endif
+
+extern int 
+fsck_minix_main(int argc, char ** argv)
+{
+        struct termios tmp;
+        int count;
+        int retcode = 0;
+
+        setlocale(LC_ALL, "");
+        bindtextdomain(PACKAGE, LOCALEDIR);
+        textdomain(PACKAGE);
+        
+
+        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 v2 inode size"));
+#endif
+        while (argc-- > 1) {
+                argv++;
+                if (argv[0][0] != '-') {
+                        if (device_name)
+                                usage();
+                        else
+                                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: usage();
+                        }
+        }
+        if (!device_name)
+                usage();
+        check_mount();          /* trying to check a mounted filesystem? */
+        if (repair && !automatic) {
+                if (!isatty(0) || !isatty(1))
+                        die(_("need terminal for interactive repairs"));
+        }
+        IN = open(device_name,repair?O_RDWR:O_RDONLY);
+        if (IN < 0)
+                die(_("unable to open '%s'"));
+        for (count=0 ; count<3 ; count++)
+                sync();
+        read_superblock();
+
+        /*
+         * Determine whether or not we should continue with the checking.
+         * This is based on the status of the filesystem valid and error
+         * flags and whether or not the -f switch was specified on the 
+         * command line.
+         */
+        printf("%s, %s / %s\n", program_name, program_version,
+               util_linux_version);
+        if ( !(Super.s_state & MINIX_ERROR_FS) && 
+              (Super.s_state & MINIX_VALID_FS) && 
+              !force ) {
+                if (repair)
+                        printf(_("%s is clean, no check.\n"), device_name);
+                return retcode;
+        }
+        else if (force)
+                printf(_("Forcing filesystem check on %s.\n"), device_name);
+        else if (repair)
+                printf(_("Filesystem on %s is dirty, needs checking.\n"),\
+                        device_name);
+
+        read_tables();
+
+        if (repair && !automatic) {
+                tcgetattr(0,&termios);
+                tmp = termios;
+                tmp.c_lflag &= ~(ICANON|ECHO);
+                tcsetattr(0,TCSANOW,&tmp);
+                termios_set = 1;
+        }
+
+#if HAVE_MINIX2
+        if (version2) {
+                check_root2 ();
+                check2 ();
+        } else 
+#endif
+          {
+                check_root();
+                check();
+        }
+        if (verbose) {
+                int i, free;
+
+                for (i=1,free=0 ; i <= INODES ; i++)
+                        if (!inode_in_use(i))
+                                free++;
+                printf(_("\n%6ld inodes used (%ld%%)\n"),(INODES-free),
+                        100*(INODES-free)/INODES);
+                for (i=FIRSTZONE,free=0 ; i < ZONES ; i++)
+                        if (!zone_in_use(i))
+                                free++;
+                printf(_("%6ld zones used (%ld%%)\n"),(ZONES-free),
+                        100*(ZONES-free)/ZONES);
+                printf(_("\n%6d regular files\n"
+                "%6d directories\n"
+                "%6d character device files\n"
+                "%6d block device files\n"
+                "%6d links\n"
+                "%6d symbolic links\n"
+                "------\n"
+                "%6d files\n"),
+                regular,directory,chardev,blockdev,
+                links-2*directory+1,symlinks,total-2*directory+1);
+        }
+        if (changed) {
+                write_tables();
+                printf(_(       "----------------------------\n"
+                        "FILE SYSTEM HAS BEEN CHANGED\n"
+                        "----------------------------\n"));
+                for (count=0 ; count<3 ; count++)
+                        sync();
+        }
+        else if ( repair )
+                write_super_block();
+        
+        if (repair && !automatic)
+                tcsetattr(0,TCSANOW,&termios);
+
+        if (changed)
+              retcode += 3;
+        if (errors_uncorrected)
+              retcode += 4;
+        return retcode;
+}
diff --git a/util-linux/mkfs_minix.c b/util-linux/mkfs_minix.c
new file mode 100644
index 000000000..7c8af7e1d
--- /dev/null
+++ b/util-linux/mkfs_minix.c
@@ -0,0 +1,755 @@
+/*
+ * mkfs.c - make a linux (minix) file-system.
+ *
+ * (C) 1991 Linus Torvalds. This file may be redistributed as per
+ * the Linux copyright.
+ */
+
+/*
+ * DD.MM.YY
+ *
+ * 24.11.91  -  Time began. Used the fsck sources to get started.
+ *
+ * 25.11.91  -  Corrected some bugs. Added support for ".badblocks"
+ *              The algorithm for ".badblocks" is a bit weird, but
+ *              it should work. Oh, well.
+ *
+ * 25.01.92  -  Added the -l option for getting the list of bad blocks
+ *              out of a named file. (Dave Rivers, rivers@ponds.uucp)
+ *
+ * 28.02.92  -  Added %-information when using -c.
+ *
+ * 28.02.93  -  Added support for other namelengths than the original
+ *              14 characters so that I can test the new kernel routines..
+ *
+ * 09.10.93  -  Make exit status conform to that required by fsutil
+ *              (Rik Faith, faith@cs.unc.edu)
+ *
+ * 31.10.93  -  Added inode request feature, for backup floppies: use
+ *              32 inodes, for a news partition use more.
+ *              (Scott Heavner, sdh@po.cwru.edu)
+ *
+ * 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)
+ * 
+ * 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)
+ *
+ * 03.20.95  -  Clear first 512 bytes of filesystem to make certain that
+ *              the filesystem is not misidentified as a MS-DOS FAT filesystem.
+ *              (Daniel Quinlan, quinlan@yggdrasil.com)
+ *
+ * 02.07.96  -  Added small patch from Russell King to make the program a
+ *              good deal more portable (janl@math.uio.no)
+ *
+ * Usage:  mkfs [-c | -l filename ] [-v] [-nXX] [-iXX] device [size-in-blocks]
+ *
+ *      -c for readablility 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 :-). 
+ */
+
+#include <stdio.h>
+#include <time.h>
+#include <unistd.h>
+#include <string.h>
+#include <signal.h>
+#include <fcntl.h>
+#include <ctype.h>
+#include <stdlib.h>
+#include <termios.h>
+#include <sys/stat.h>
+#include <sys/ioctl.h>
+#include <mntent.h>
+#include <getopt.h>
+
+#include <linux/fs.h>
+#include <linux/minix_fs.h>
+
+#include "nls.h"
+#include "../version.h"
+
+#ifdef MINIX2_SUPER_MAGIC2
+#define HAVE_MINIX2 1
+#endif
+
+#ifndef __GNUC__
+#error "needs gcc for the bitop-__asm__'s"
+#endif
+
+#ifndef __linux__
+#define volatile
+#endif
+
+#define MINIX_ROOT_INO 1
+#define MINIX_BAD_INO 2
+
+#define TEST_BUFFER_BLOCKS 16
+#define MAX_GOOD_BLOCKS 512
+
+#define UPPER(size,n) (((size)+((n)-1))/(n))
+#define INODE_SIZE (sizeof(struct minix_inode))
+#ifdef HAVE_MINIX2
+#define INODE_SIZE2 (sizeof(struct minix2_inode))
+#define INODE_BLOCKS UPPER(INODES, (version2 ? MINIX2_INODES_PER_BLOCK \
+                                    : MINIX_INODES_PER_BLOCK))
+#else
+#define INODE_BLOCKS UPPER(INODES, (MINIX_INODES_PER_BLOCK))
+#endif
+#define INODE_BUFFER_SIZE (INODE_BLOCKS * BLOCK_SIZE)
+
+#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 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 dirsize = 32;
+static int magic = MINIX_SUPER_MAGIC2;
+static int version2 = 0;
+
+static char root_block[BLOCK_SIZE] = "\0";
+
+static char * inode_buffer = NULL;
+#define Inode (((struct minix_inode *) inode_buffer)-1)
+#ifdef HAVE_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))
+#else
+#define ZONES ((unsigned long)(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 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 = 0;
+static unsigned long req_nr_inodes = 0;
+
+#include "bitops.h"
+
+#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)))
+
+#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.
+ */
+volatile void fatal_error(const char * fmt_string,int status)
+{
+        fprintf(stderr,fmt_string,program_name,device_name);
+        exit(status);
+}
+
+volatile void die(char *str) {
+        fprintf(stderr, "%s: %s\n", program_name, str);
+        exit(8);
+}
+
+volatile void 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);
+}
+
+/*
+ * 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;
+
+        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;
+
+        die(_("%s is mounted; will not make a filesystem here!"));
+}
+
+static long valid_offset (int fd, int offset)
+{
+        char ch;
+
+        if (lseek (fd, offset, 0) < 0)
+                return 0;
+        if (read (fd, &ch, 1) < 1)
+                return 0;
+        return 1;
+}
+
+static int count_blocks (int fd)
+{
+        int high, low;
+
+        low = 0;
+        for (high = 1; valid_offset (fd, high); high *= 2)
+                low = high;
+        while (low < high - 1)
+        {
+                const int mid = (low + high) / 2;
+
+                if (valid_offset (fd, mid))
+                        low = mid;
+                else
+                        high = mid;
+        }
+        valid_offset (fd, 0);
+        return (low + 1);
+}
+
+static int get_size(const char  *file)
+{
+        int     fd;
+        long    size;
+
+        fd = open(file, O_RDWR);
+        if (fd < 0) {
+                perror(file);
+                exit(1);
+        }
+        if (ioctl(fd, BLKGETSIZE, &size) >= 0) {
+                close(fd);
+                return (size * 512);
+        }
+                
+        size = count_blocks(fd);
+        close(fd);
+        return size;
+}
+
+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"));
+        if (512 != write(DEV, boot_block_buffer, 512))
+                die(_("unable to clear boot sector"));
+        if (BLOCK_SIZE != lseek(DEV, BLOCK_SIZE, SEEK_SET))
+                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"));
+        
+}
+
+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 (BLOCK_SIZE != write(DEV, buffer, BLOCK_SIZE))
+                die(_("write failed in write_block"));
+}
+
+int get_free_block(void)
+{
+        int blk;
+
+        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;
+        else
+                blk = FIRSTZONE;
+        while (blk < ZONES && zone_in_use(blk))
+                blk++;
+        if (blk >= ZONES)
+                die(_("not enough good blocks"));
+        good_blocks_table[used_good_blocks] = blk;
+        used_good_blocks++;
+        return blk;
+}
+
+void mark_good_blocks(void)
+{
+        int 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;
+        while (++zone < ZONES)
+                if (zone_in_use(zone))
+                        return zone;
+        return 0;
+}
+
+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];
+
+#define NEXT_BAD (zone = next(zone))
+
+        if (!badblocks)
+                return;
+        mark_inode(MINIX_BAD_INO);
+        inode->i_nlinks = 1;
+        inode->i_time = time(NULL);
+        inode->i_mode = S_IFREG + 0000;
+        inode->i_size = badblocks*BLOCK_SIZE;
+        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);
+        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);
+                dind_block[i] = ind = get_free_block();
+                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:
+        if (ind)
+                write_block(ind, (char *) ind_block);
+        if (dind)
+                write_block(dind, (char *) dind_block);
+}
+
+#ifdef HAVE_MINIX2
+void
+make_bad_inode2 (void)
+{
+        struct minix2_inode *inode = &Inode2[MINIX_BAD_INO];
+        int i, j, zone;
+        int ind = 0, dind = 0;
+        unsigned long ind_block[BLOCK_SIZE >> 2];
+        unsigned long dind_block[BLOCK_SIZE >> 2];
+
+        if (!badblocks)
+                return;
+        mark_inode (MINIX_BAD_INO);
+        inode->i_nlinks = 1;
+        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);
+        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 < 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);
+        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);
+                for (j = 0; j < 256; j++) {
+                        ind_block[j] = zone;
+                        if (!NEXT_BAD)
+                                goto end_bad;
+                }
+        }
+        /* Could make triple indirect block here */
+        die (_("too many bad blocks"));
+ end_bad:
+        if (ind)
+                write_block (ind, (char *) ind_block);
+        if (dind)
+                write_block (dind, (char *) dind_block);
+}
+#endif
+
+void make_root_inode(void)
+{
+        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;
+        else {
+                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);
+}
+
+#ifdef HAVE_MINIX2
+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 ();
+        inode->i_nlinks = 2;
+        inode->i_atime = inode->i_mtime = inode->i_ctime = time (NULL);
+        if (badblocks)
+                inode->i_size = 3 * dirsize;
+        else {
+                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);
+}
+#endif
+
+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;
+        ZONES = 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
+        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) {
+                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++)
+                unmark_zone(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);
+}
+
+/*
+ * 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 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"));
+        }
+
+
+        /* 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"));
+        }
+        got /= BLOCK_SIZE;
+        return got;
+}
+
+static unsigned int currently_testing = 0;
+
+void alarm_intr(int alnum)
+{
+        if (currently_testing >= ZONES)
+                return;
+        signal(SIGALRM,alarm_intr);
+        alarm(5);
+        if (!currently_testing)
+                return;
+        printf("%d ...", currently_testing);
+        fflush(stdout);
+}
+
+void check_blocks(void)
+{
+        int try,got;
+        static char buffer[BLOCK_SIZE * TEST_BUFFER_BLOCKS];
+
+        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"));
+                try = TEST_BUFFER_BLOCKS;
+                if (currently_testing + try > ZONES)
+                        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"));
+                mark_zone(currently_testing);
+                badblocks++;
+                currently_testing++;
+        }
+        if (badblocks > 1)
+                printf(_("%d bad blocks\n"), badblocks);
+        else if (badblocks == 1)
+                printf(_("one bad block\n"));
+}
+
+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"));
+}
+
+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"));
+#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;
+#else
+        fatal_error(_("%s: not compiled with minix v2 support\n"),-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
+#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
+#endif
+    {
+      make_root_inode();
+      make_bad_inode();
+    }
+  mark_good_blocks();
+  write_tables();
+  return 0;
+}