fsck: more clever (->smaller) handling of parameters
[platform/upstream/busybox.git] / e2fsprogs / fsck.c
index 7f7ab3e..21b2fdc 100644 (file)
@@ -1,5 +1,6 @@
+/* vi: set sw=4 ts=4: */
 /*
- * pfsck --- A generic, parallelizing front-end for the fsck program.
+ * fsck --- A generic, parallelizing front-end for the fsck program.
  * It will automatically try to run fsck programs in parallel if the
  * devices are on separate spindles.  It is based on the same ideas as
  * the generic front end for fsck by David Engel and Fred van Kempen,
  * Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
  *      2001, 2002, 2003, 2004, 2005 by  Theodore Ts'o.
  *
- * %Begin-Header%
- * This file may be redistributed under the terms of the GNU Public
- * License.
- * %End-Header%
+ * Licensed under GPLv2, see file LICENSE in this tarball for details.
  */
 
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <sys/signal.h>
-#include <sys/stat.h>
-#include <limits.h>
-#include <stdio.h>
-#include <ctype.h>
-#include <string.h>
-#include <time.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <paths.h>
-#include <unistd.h>
-#include <errno.h>
-#include <malloc.h>
-#include <signal.h>
-
-#include "fsck.h"
-#include "blkid/blkid.h"
-
-#include "e2fsbb.h"
-
-#include "busybox.h"
-
-#ifndef _PATH_MNTTAB
-#define _PATH_MNTTAB    "/etc/fstab"
-#endif
-
-/*
- * fsck.h
+/* All filesystem specific hooks have been removed.
+ * If filesystem cannot be determined, we will execute
+ * "fsck.auto". Currently this also happens if you specify
+ * UUID=xxx or LABEL=xxx as an object to check.
+ * Detection code for that is also probably has to be in fsck.auto.
+ *
+ * In other words, this is _really_ is just a driver program which
+ * spawns actual fsck.something for each filesystem to check.
+ * It doesn't guess filesystem types from on-disk format.
  */
 
-#ifndef DEFAULT_FSTYPE
-#define DEFAULT_FSTYPE "ext2"
-#endif
+#include "libbb.h"
+
+/* "progress indicator" code is somewhat buggy and ext[23] specific.
+ * We should be filesystem agnostic. IOW: there should be a well-defined
+ * API for fsck.something, NOT ad-hoc hacks in generic fsck. */
+#define DO_PROGRESS_INDICATOR 0
 
-#define MAX_DEVICES 32
-#define MAX_ARGS 32
+#define EXIT_OK          0
+#define EXIT_NONDESTRUCT 1
+#define EXIT_DESTRUCT    2
+#define EXIT_UNCORRECTED 4
+#define EXIT_ERROR       8
+#define EXIT_USAGE       16
+#define FSCK_CANCELED    32     /* Aborted with a signal or ^C */
 
 /*
- * Internal structure for mount tabel entries.
+ * Internal structure for mount table entries.
  */
 
 struct fs_info {
-       char  *device;
-       char  *mountpt;
-       char  *type;
-       char  *opts;
-       int   freq;
-       int   passno;
-       int   flags;
        struct fs_info *next;
+       char    *device;
+       char    *mountpt;
+       char    *type;
+       char    *opts;
+       int     passno;
+       int     flags;
 };
 
 #define FLAG_DONE 1
 #define FLAG_PROGRESS 2
-
 /*
  * Structure to allow exit codes to be stored
  */
 struct fsck_instance {
+       struct fsck_instance *next;
        int     pid;
        int     flags;
-       int     exit_status;
+#if DO_PROGRESS_INDICATOR
        time_t  start_time;
-       char *  prog;
-       char *  type;
-       char *  device;
-       char *  base_device;
-       struct fsck_instance *next;
+#endif
+       char    *prog;
+       char    *device;
+       char    *base_device; /* /dev/hda for /dev/hdaN etc */
 };
 
+static const char ignored_types[] ALIGN1 =
+       "ignore\0"
+       "iso9660\0"
+       "nfs\0"
+       "proc\0"
+       "sw\0"
+       "swap\0"
+       "tmpfs\0"
+       "devpts\0";
+
+#if 0
+static const char really_wanted[] ALIGN1 =
+       "minix\0"
+       "ext2\0"
+       "ext3\0"
+       "jfs\0"
+       "reiserfs\0"
+       "xiafs\0"
+       "xfs\0";
+#endif
+
+#define BASE_MD "/dev/md"
+
+static char **args;
+static int num_args;
+static int verbose;
+
+#define FS_TYPE_FLAG_NORMAL 0
+#define FS_TYPE_FLAG_OPT    1
+#define FS_TYPE_FLAG_NEGOPT 2
+static char **fs_type_list;
+static uint8_t *fs_type_flag;
+static smallint fs_type_negated;
+
+static smallint noexecute;
+static smallint serialize;
+static smallint skip_root;
+/* static smallint like_mount; */
+static smallint parallel_root;
+static smallint force_all_parallel;
+
+#if DO_PROGRESS_INDICATOR
+static smallint progress;
+static int progress_fd;
+#endif
+
+static int num_running;
+static int max_running;
+static char *fstype;
+static struct fs_info *filesys_info;
+static struct fs_info *filesys_last;
+static struct fsck_instance *instance_list;
+
 /*
- * base_device.c
- *
  * Return the "base device" given a particular device; this is used to
  * assure that we only fsck one partition on a particular drive at any
  * one time.  Otherwise, the disk heads will be seeking all over the
- * place.  If the base device can not be determined, return NULL.
- * 
+ * place.  If the base device cannot be determined, return NULL.
+ *
  * The base_device() function returns an allocated string which must
  * be freed.
- * 
  */
-
-
-#ifdef CONFIG_FEATURE_DEVFS
+#if ENABLE_FEATURE_DEVFS
 /*
  * Required for the uber-silly devfs /dev/ide/host1/bus2/target3/lun3
  * pathames.
  */
-static const char * const devfs_hier[] = {
-       "host", "bus", "target", "lun", 0
+static const char *const devfs_hier[] = {
+       "host", "bus", "target", "lun", NULL
 };
 #endif
 
 static char *base_device(const char *device)
 {
        char *str, *cp;
-#ifdef CONFIG_FEATURE_DEVFS
-       const char * const *hier;
+#if ENABLE_FEATURE_DEVFS
+       const char *const *hier;
        const char *disk;
        int len;
 #endif
-
-       cp = str = bb_xstrdup(device);
+       cp = str = xstrdup(device);
 
        /* Skip over /dev/; if it's not present, give up. */
        if (strncmp(cp, "/dev/", 5) != 0)
                goto errout;
        cp += 5;
 
-#if 0  /* this is for old stuff no one uses anymore ? */
-       /* Skip over /dev/dsk/... */
-       if (strncmp(cp, "dsk/", 4) == 0)
-               cp += 4;
-#endif
-
        /*
         * For md devices, we treat them all as if they were all
         * on one disk, since we don't know how to parallelize them.
         */
        if (cp[0] == 'm' && cp[1] == 'd') {
-               *(cp+2) = 0;
+               cp[2] = 0;
                return str;
        }
 
        /* Handle DAC 960 devices */
        if (strncmp(cp, "rd/", 3) == 0) {
                cp += 3;
-               if (cp[0] != 'c' || cp[2] != 'd' ||
-                   !isdigit(cp[1]) || !isdigit(cp[3]))
+               if (cp[0] != 'c' || !isdigit(cp[1])
+                || cp[2] != 'd' || !isdigit(cp[3]))
                        goto errout;
-               *(cp+4) = 0;
+               cp[4] = 0;
                return str;
        }
 
        /* Now let's handle /dev/hd* and /dev/sd* devices.... */
-       if ((cp[0] == 'h' || cp[0] == 's') && (cp[1] == 'd')) {
+       if ((cp[0] == 'h' || cp[0] == 's') && cp[1] == 'd') {
                cp += 2;
                /* If there's a single number after /dev/hd, skip it */
                if (isdigit(*cp))
@@ -171,11 +195,11 @@ static char *base_device(const char *device)
                /* What follows must be an alpha char, or give up */
                if (!isalpha(*cp))
                        goto errout;
-               *(cp + 1) = 0;
+               cp[1] = 0;
                return str;
        }
 
-#ifdef CONFIG_FEATURE_DEVFS
+#if ENABLE_FEATURE_DEVFS
        /* Now let's handle devfs (ugh) names */
        len = 0;
        if (strncmp(cp, "ide/", 4) == 0)
@@ -202,7 +226,7 @@ static char *base_device(const char *device)
                        }
                        cp++;
                }
-               *(cp - 1) = 0;
+               cp[-1] = 0;
                return str;
        }
 
@@ -226,179 +250,35 @@ static char *base_device(const char *device)
                return str;
        }
 #endif
-
-errout:
+ errout:
        free(str);
        return NULL;
 }
 
-
-static const char * const ignored_types[] = {
-       "ignore",
-       "iso9660",
-       "nfs",
-       "proc",
-       "sw",
-       "swap",
-       "tmpfs",
-       "devpts",
-       NULL
-};
-
-static const char * const really_wanted[] = {
-       "minix",
-       "ext2",
-       "ext3",
-       "jfs",
-       "reiserfs",
-       "xiafs",
-       "xfs",
-       NULL
-};
-
-#define BASE_MD "/dev/md"
-
-/*
- * Global variables for options
- */
-static char *devices[MAX_DEVICES];
-static char *args[MAX_ARGS];
-static int num_devices, num_args;
-
-static int verbose;
-static int doall;
-static int noexecute;
-static int serialize;
-static int skip_root;
-static int like_mount;
-static int notitle;
-static int parallel_root;
-static int progress;
-static int progress_fd;
-static int force_all_parallel;
-static int num_running;
-static int max_running;
-static volatile int cancel_requested;
-static int kill_sent;
-static char *fstype;
-static struct fs_info *filesys_info, *filesys_last;
-static struct fsck_instance *instance_list;
-static char *fsck_path;
-static blkid_cache cache;
-
-static char *string_copy(const char *s)
+static void free_instance(struct fsck_instance *p)
 {
-       char    *ret;
-
-       if (!s)
-               return 0;
-       ret = strdup(s);
-       return ret;
-}
-
-static int string_to_int(const char *s)
-{
-       long l;
-       char *p;
-
-       l = strtol(s, &p, 0);
-       if (*p || l == LONG_MIN || l == LONG_MAX || l < 0 || l > INT_MAX)
-               return -1;
-       else
-               return (int) l;
-}
-
-static char *skip_over_blank(char *cp)
-{
-       while (*cp && isspace(*cp))
-               cp++;
-       return cp;
-}
-
-static char *skip_over_word(char *cp)
-{
-       while (*cp && !isspace(*cp))
-               cp++;
-       return cp;
-}
-
-static void strip_line(char *line)
-{
-       char    *p;
-
-       while (*line) {
-               p = line + strlen(line) - 1;
-               if ((*p == '\n') || (*p == '\r'))
-                       *p = 0;
-               else
-                       break;
-       }
-}
-
-static char *parse_word(char **buf)
-{
-       char *word, *next;
-
-       word = *buf;
-       if (*word == 0)
-               return 0;
-
-       word = skip_over_blank(word);
-       next = skip_over_word(word);
-       if (*next)
-               *next++ = 0;
-       *buf = next;
-       return word;
-}
-
-static void parse_escape(char *word)
-{
-       char    *q, c;
-       const char *p;
-
-       if (!word)
-               return;
-
-       for (p = q = word; *p; q++) {
-               c = *p++;
-               if (c != '\\') {
-                       *q = c;
-               } else {
-                       *q = bb_process_escape_sequence(&p);
-               }
-       }
-       *q = 0;
-}
-
-static void free_instance(struct fsck_instance *i)
-{
-       if (i->prog)
-               free(i->prog);
-       if (i->device)
-               free(i->device);
-       if (i->base_device)
-               free(i->base_device);
-       free(i);
-       return;
+       free(p->prog);
+       free(p->device);
+       free(p->base_device);
+       free(p);
 }
 
 static struct fs_info *create_fs_device(const char *device, const char *mntpnt,
                                        const char *type, const char *opts,
-                                       int freq, int passno)
+                                       int passno)
 {
        struct fs_info *fs;
 
-       if (!(fs = malloc(sizeof(struct fs_info))))
-               return NULL;
-
-       fs->device = string_copy(device);
-       fs->mountpt = string_copy(mntpnt);
-       fs->type = string_copy(type);
-       fs->opts = string_copy(opts ? opts : "");
-       fs->freq = freq;
-       fs->passno = passno;
-       fs->flags = 0;
-       fs->next = NULL;
+       fs = xzalloc(sizeof(*fs));
+       fs->device = xstrdup(device);
+       fs->mountpt = xstrdup(mntpnt);
+       if (strchr(type, ','))
+               type = (char *)"auto";
+       fs->type = xstrdup(type);
+       fs->opts = xstrdup(opts ? opts : "");
+       fs->passno = passno < 0 ? 1 : passno;
+       /*fs->flags = 0; */
+       /*fs->next = NULL; */
 
        if (!filesys_info)
                filesys_info = fs;
@@ -409,116 +289,29 @@ static struct fs_info *create_fs_device(const char *device, const char *mntpnt,
        return fs;
 }
 
-
-
-static int parse_fstab_line(char *line, struct fs_info **ret_fs)
-{
-       char    *dev, *device, *mntpnt, *type, *opts, *freq, *passno, *cp;
-       struct fs_info *fs;
-
-       *ret_fs = 0;
-       strip_line(line);
-       if ((cp = strchr(line, '#')))
-               *cp = 0;        /* Ignore everything after the comment char */
-       cp = line;
-
-       device = parse_word(&cp);
-       mntpnt = parse_word(&cp);
-       type = parse_word(&cp);
-       opts = parse_word(&cp);
-       freq = parse_word(&cp);
-       passno = parse_word(&cp);
-
-       if (!device)
-               return 0;       /* Allow blank lines */
-
-       if (!mntpnt || !type)
-               return -1;
-
-       parse_escape(device);
-       parse_escape(mntpnt);
-       parse_escape(type);
-       parse_escape(opts);
-       parse_escape(freq);
-       parse_escape(passno);
-
-       dev = blkid_get_devname(cache, device, NULL);
-       if (dev)
-               device = dev;
-
-       if (strchr(type, ','))
-               type = 0;
-
-       fs = create_fs_device(device, mntpnt, type ? type : "auto", opts,
-                             freq ? atoi(freq) : -1,
-                             passno ? atoi(passno) : -1);
-       if (dev)
-               free(dev);
-
-       if (!fs)
-               return -1;
-       *ret_fs = fs;
-       return 0;
-}
-
-static void interpret_type(struct fs_info *fs)
-{
-       char    *t;
-
-       if (strcmp(fs->type, "auto") != 0)
-               return;
-       t = blkid_get_tag_value(cache, "TYPE", fs->device);
-       if (t) {
-               free(fs->type);
-               fs->type = t;
-       }
-}
-
-/*
- * Load the filesystem database from /etc/fstab
- */
+/* Load the filesystem database from /etc/fstab */
 static void load_fs_info(const char *filename)
 {
-       FILE    *f;
-       char    buf[1024];
-       int     lineno = 0;
-       int     old_fstab = 1;
+       FILE *fstab;
+       struct mntent mte;
        struct fs_info *fs;
 
-       if ((f = fopen(filename, "r")) == NULL) {
-               bb_perror_msg("WARNING: couldn't open %s", filename);
+       fstab = setmntent(filename, "r");
+       if (!fstab) {
+               bb_perror_msg("cannot read %s", filename);
                return;
        }
-       while (!feof(f)) {
-               lineno++;
-               if (!fgets(buf, sizeof(buf), f))
-                       break;
-               buf[sizeof(buf)-1] = 0;
-               if (parse_fstab_line(buf, &fs) < 0) {
-                       bb_error_msg("WARNING: bad format "
-                               "on line %d of %s\n", lineno, filename);
-                       continue;
-               }
-               if (!fs)
-                       continue;
-               if (fs->passno < 0)
-                       fs->passno = 0;
-               else
-                       old_fstab = 0;
-       }
-
-       fclose(f);
-
-       if (old_fstab) {
-               fputs("\007\007\007"
-               "WARNING: Your /etc/fstab does not contain the fsck passno\n"
-               "       field.  I will kludge around things for you, but you\n"
-               "       should fix your /etc/fstab file as soon as you can.\n\n", stderr);
 
-               for (fs = filesys_info; fs; fs = fs->next) {
-                       fs->passno = 1;
-               }
+       // Loop through entries
+       while (getmntent_r(fstab, &mte, bb_common_bufsiz1, COMMON_BUFSIZE)) {
+               //bb_info_msg("CREATE[%s][%s][%s][%s][%d]", mte.mnt_fsname, mte.mnt_dir,
+               //      mte.mnt_type, mte.mnt_opts,
+               //      mte.mnt_passno);
+               fs = create_fs_device(mte.mnt_fsname, mte.mnt_dir,
+                       mte.mnt_type, mte.mnt_opts,
+                       mte.mnt_passno);
        }
+       endmntent(fstab);
 }
 
 /* Lookup filesys in /etc/fstab and return the corresponding entry. */
@@ -526,39 +319,17 @@ static struct fs_info *lookup(char *filesys)
 {
        struct fs_info *fs;
 
-       /* No filesys name given. */
-       if (filesys == NULL)
-               return NULL;
-
        for (fs = filesys_info; fs; fs = fs->next) {
-               if (!strcmp(filesys, fs->device) ||
-                   (fs->mountpt && !strcmp(filesys, fs->mountpt)))
+               if (strcmp(filesys, fs->device) == 0
+                || (fs->mountpt && strcmp(filesys, fs->mountpt) == 0)
+               )
                        break;
        }
 
        return fs;
 }
 
-/* Find fsck program for a given fs type. */
-static char *find_fsck(char *type)
-{
-  char *s;
-  const char *tpl;
-  char *p = string_copy(fsck_path);
-  struct stat st;
-
-  /* Are we looking for a program or just a type? */
-  tpl = (strncmp(type, "fsck.", 5) ? "%s/fsck.%s" : "%s/%s");
-
-  for(s = strtok(p, ":"); s; s = strtok(NULL, ":")) {
-       s = bb_xasprintf(tpl, s, type);
-       if (stat(s, &st) == 0) break;
-       free(s);
-  }
-  free(p);
-  return(s);
-}
-
+#if DO_PROGRESS_INDICATOR
 static int progress_active(void)
 {
        struct fsck_instance *inst;
@@ -571,251 +342,213 @@ static int progress_active(void)
        }
        return 0;
 }
+#endif
 
-/*
- * Execute a particular fsck program, and link it into the list of
- * child processes we are waiting for.
- */
-static int execute(const char *type, const char *device, const char *mntpt,
-                  int interactive)
-{
-       char *s, *argv[80];
-       char *prog;
-       int  argc, i;
-       struct fsck_instance *inst, *p;
-       pid_t   pid;
-
-       inst = malloc(sizeof(struct fsck_instance));
-       if (!inst)
-               return ENOMEM;
-       memset(inst, 0, sizeof(struct fsck_instance));
-
-       prog = bb_xasprintf("fsck.%s", type);
-       argv[0] = prog;
-       argc = 1;
-
-       for (i=0; i <num_args; i++)
-               argv[argc++] = string_copy(args[i]);
-
-       if (progress && !progress_active()) {
-               if ((strcmp(type, "ext2") == 0) ||
-                   (strcmp(type, "ext3") == 0)) {
-                       char tmp[80];
-                       snprintf(tmp, 80, "-C%d", progress_fd);
-                       argv[argc++] = string_copy(tmp);
-                       inst->flags |= FLAG_PROGRESS;
-               }
-       }
-
-       argv[argc++] = string_copy(device);
-       argv[argc] = 0;
-
-       s = find_fsck(prog);
-       if (s == NULL) {
-               bb_error_msg("%s: not found", prog);
-               return ENOENT;
-       }
-
-       if (verbose || noexecute) {
-               printf("[%s (%d) -- %s] ", s, num_running,
-                      mntpt ? mntpt : device);
-               for (i=0; i < argc; i++)
-                       printf("%s ", argv[i]);
-               printf("\n");
-       }
-
-       /* Fork and execute the correct program. */
-       if (noexecute)
-               pid = -1;
-       else if ((pid = fork()) < 0) {
-               perror("fork");
-               return errno;
-       } else if (pid == 0) {
-               if (!interactive)
-                       close(0);
-               (void) execv(s, argv);
-               bb_perror_msg_and_die("%s", argv[0]);
-       }
-
-       for (i = 1; i < argc; i++)
-               free(argv[i]);
-
-       free(s);
-       inst->pid = pid;
-       inst->prog = prog;
-       inst->type = string_copy(type);
-       inst->device = string_copy(device);
-       inst->base_device = base_device(device);
-       inst->start_time = time(0);
-       inst->next = NULL;
-
-       /*
-        * Find the end of the list, so we add the instance on at the end.
-        */
-       for (p = instance_list; p && p->next; p = p->next);
-
-       if (p)
-               p->next = inst;
-       else
-               instance_list = inst;
-
-       return 0;
-}
 
 /*
  * Send a signal to all outstanding fsck child processes
  */
-static int kill_all(int signum)
+static void kill_all_if_got_signal(void)
 {
+       static smallint kill_sent;
+
        struct fsck_instance *inst;
-       int     n = 0;
+
+       if (!bb_got_signal || kill_sent)
+               return;
 
        for (inst = instance_list; inst; inst = inst->next) {
                if (inst->flags & FLAG_DONE)
                        continue;
-               kill(inst->pid, signum);
-               n++;
+               kill(inst->pid, SIGTERM);
        }
-       return n;
+       kill_sent = 1;
 }
 
 /*
  * Wait for one child process to exit; when it does, unlink it from
- * the list of executing child processes, and return it.
+ * the list of executing child processes, free, and return its exit status.
+ * If there is no exited child, return -1.
  */
-static struct fsck_instance *wait_one(int flags)
+static int wait_one(int flags)
 {
-       int     status;
-       int     sig;
-       struct fsck_instance *inst, *inst2, *prev;
-       pid_t   pid;
+       int status;
+       int sig;
+       struct fsck_instance *inst, *prev;
+       pid_t pid;
 
        if (!instance_list)
-               return NULL;
-
-       if (noexecute) {
-               inst = instance_list;
-               prev = 0;
-#ifdef RANDOM_DEBUG
-               while (inst->next && (random() & 1)) {
-                       prev = inst;
-                       inst = inst->next;
-               }
-#endif
-               inst->exit_status = 0;
-               goto ret_inst;
-       }
-
-       /*
-        * gcc -Wall fails saving throw against stupidity
-        * (inst and prev are thought to be uninitialized variables)
-        */
-       inst = prev = NULL;
+               return -1;
+       /* if (noexecute) { already returned -1; } */
 
-       do {
+       while (1) {
                pid = waitpid(-1, &status, flags);
-               if (cancel_requested && !kill_sent) {
-                       kill_all(SIGTERM);
-                       kill_sent++;
-               }
-               if ((pid == 0) && (flags & WNOHANG))
-                       return NULL;
+               kill_all_if_got_signal();
+               if (pid == 0) /* flags == WNOHANG and no children exited */
+                       return -1;
                if (pid < 0) {
-                       if ((errno == EINTR) || (errno == EAGAIN))
+                       if (errno == EINTR)
                                continue;
-                       if (errno == ECHILD) {
-                               bb_error_msg("wait: No more child process?!?");
-                               return NULL;
+                       if (errno == ECHILD) { /* paranoia */
+                               bb_error_msg("wait: no more children");
+                               return -1;
                        }
-                       perror("wait");
+                       bb_perror_msg("wait");
                        continue;
                }
-               for (prev = 0, inst = instance_list;
-                    inst;
-                    prev = inst, inst = inst->next) {
+               prev = NULL;
+               inst = instance_list;
+               do {
                        if (inst->pid == pid)
-                               break;
-               }
-       } while (!inst);
+                               goto child_died;
+                       prev = inst;
+                       inst = inst->next;
+               } while (inst);
+       }
+ child_died:
 
        if (WIFEXITED(status))
                status = WEXITSTATUS(status);
        else if (WIFSIGNALED(status)) {
                sig = WTERMSIG(status);
-               if (sig == SIGINT) {
-                       status = EXIT_UNCORRECTED;
-               } else {
-                       printf("Warning... %s for device %s exited "
-                              "with signal %d.\n",
-                              inst->prog, inst->device, sig);
+               status = EXIT_UNCORRECTED;
+               if (sig != SIGINT) {
+                       printf("Warning: %s %s terminated "
+                               "by signal %d\n",
+                               inst->prog, inst->device, sig);
                        status = EXIT_ERROR;
                }
        } else {
-               printf("%s %s: status is %x, should never happen.\n",
-                      inst->prog, inst->device, status);
+               printf("%s %s: status is %x, should never happen\n",
+                       inst->prog, inst->device, status);
                status = EXIT_ERROR;
        }
-       inst->exit_status = status;
-       if (progress && (inst->flags & FLAG_PROGRESS) &&
-           !progress_active()) {
+
+#if DO_PROGRESS_INDICATOR
+       if (progress && (inst->flags & FLAG_PROGRESS) && !progress_active()) {
+               struct fsck_instance *inst2;
                for (inst2 = instance_list; inst2; inst2 = inst2->next) {
                        if (inst2->flags & FLAG_DONE)
                                continue;
-                       if (strcmp(inst2->type, "ext2") &&
-                           strcmp(inst2->type, "ext3"))
+                       if (strcmp(inst2->type, "ext2") != 0
+                        && strcmp(inst2->type, "ext3") != 0
+                       ) {
                                continue;
-                       /*
+                       }
+                       /* ext[23], we will send USR1
+                        * (request to start displaying progress bar)
+                        *
                         * If we've just started the fsck, wait a tiny
                         * bit before sending the kill, to give it
                         * time to set up the signal handler
                         */
-                       if (inst2->start_time < time(0)+2) {
-                               if (fork() == 0) {
-                                       sleep(1);
-                                       kill(inst2->pid, SIGUSR1);
-                                       exit(0);
-                               }
-                       } else
-                               kill(inst2->pid, SIGUSR1);
+                       if (inst2->start_time >= time(NULL) - 1)
+                               sleep(1);
+                       kill(inst2->pid, SIGUSR1);
                        inst2->flags |= FLAG_PROGRESS;
                        break;
                }
        }
-ret_inst:
+#endif
+
        if (prev)
                prev->next = inst->next;
        else
                instance_list = inst->next;
        if (verbose > 1)
                printf("Finished with %s (exit status %d)\n",
-                      inst->device, inst->exit_status);
+                      inst->device, status);
        num_running--;
-       return inst;
+       free_instance(inst);
+
+       return status;
 }
 
-#define FLAG_WAIT_ALL           0
-#define FLAG_WAIT_ATLEAST_ONE   1
 /*
  * Wait until all executing child processes have exited; return the
  * logical OR of all of their exit code values.
  */
+#define FLAG_WAIT_ALL           0
+#define FLAG_WAIT_ATLEAST_ONE   WNOHANG
 static int wait_many(int flags)
 {
+       int exit_status;
+       int global_status = 0;
+       int wait_flags = 0;
+
+       while ((exit_status = wait_one(wait_flags)) != -1) {
+               global_status |= exit_status;
+               wait_flags |= flags;
+       }
+       return global_status;
+}
+
+/*
+ * Execute a particular fsck program, and link it into the list of
+ * child processes we are waiting for.
+ */
+static void execute(const char *type, const char *device,
+               const char *mntpt /*, int interactive */)
+{
+       int i;
        struct fsck_instance *inst;
-       int     global_status = 0;
-       int     wait_flags = 0;
-
-       while ((inst = wait_one(wait_flags))) {
-               global_status |= inst->exit_status;
-               free_instance(inst);
-#ifdef RANDOM_DEBUG
-               if (noexecute && (flags & WNOHANG) && !(random() % 3))
-                       break;
+       pid_t pid;
+
+       args[0] = xasprintf("fsck.%s", type);
+
+#if DO_PROGRESS_INDICATOR
+       if (progress && !progress_active()) {
+               if (strcmp(type, "ext2") == 0
+                || strcmp(type, "ext3") == 0
+               ) {
+                       args[XXX] = xasprintf("-C%d", progress_fd); /* 1 */
+                       inst->flags |= FLAG_PROGRESS;
+               }
+       }
 #endif
-               if (flags & FLAG_WAIT_ATLEAST_ONE)
-                       wait_flags = WNOHANG;
+
+       args[num_args - 2] = (char*)device;
+       /* args[num_args - 1] = NULL; - already is */
+
+       if (verbose || noexecute) {
+               printf("[%s (%d) -- %s]", args[0], num_running,
+                                       mntpt ? mntpt : device);
+               for (i = 0; args[i]; i++)
+                       printf(" %s", args[i]);
+               bb_putchar('\n');
        }
-       return global_status;
+
+       /* Fork and execute the correct program. */
+       pid = -1;
+       if (!noexecute) {
+               pid = spawn(args);
+               if (pid < 0)
+                       bb_simple_perror_msg(args[0]);
+       }
+
+#if DO_PROGRESS_INDICATOR
+       free(args[XXX]);
+#endif
+
+       /* No child, so don't record an instance */
+       if (pid <= 0) {
+               free(args[0]);
+               return;
+       }
+
+       inst = xzalloc(sizeof(*inst));
+       inst->pid = pid;
+       inst->prog = args[0];
+       inst->device = xstrdup(device);
+       inst->base_device = base_device(device);
+#if DO_PROGRESS_INDICATOR
+       inst->start_time = time(NULL);
+#endif
+
+       /* Add to the list of running fsck's.
+        * (was adding to the end, but adding to the front is simpler...) */
+       inst->next = instance_list;
+       instance_list = inst;
 }
 
 /*
@@ -826,107 +559,77 @@ static int wait_many(int flags)
  * use that type regardless of what is specified in /etc/fstab.
  *
  * If the type isn't specified by the user, then use either the type
- * specified in /etc/fstab, or DEFAULT_FSTYPE.
+ * specified in /etc/fstab, or "auto".
  */
-static void fsck_device(struct fs_info *fs, int interactive)
+static void fsck_device(struct fs_info *fs /*, int interactive */)
 {
        const char *type;
-       int retval;
 
-       interpret_type(fs);
-
-       if (strcmp(fs->type, "auto") != 0)
+       if (strcmp(fs->type, "auto") != 0) {
                type = fs->type;
-       else if (fstype && strncmp(fstype, "no", 2) &&
-           strncmp(fstype, "opts=", 5) && strncmp(fstype, "loop", 4) &&
-           !strchr(fstype, ','))
+               if (verbose > 2)
+                       bb_info_msg("using filesystem type '%s' %s",
+                                       type, "from fstab");
+       } else if (fstype
+        && (fstype[0] != 'n' || fstype[1] != 'o') /* != "no" */
+        && strncmp(fstype, "opts=", 5) != 0
+        && strncmp(fstype, "loop", 4) != 0
+        && !strchr(fstype, ',')
+       ) {
                type = fstype;
-       else
-               type = DEFAULT_FSTYPE;
+               if (verbose > 2)
+                       bb_info_msg("using filesystem type '%s' %s",
+                                       type, "from -t");
+       } else {
+               type = "auto";
+               if (verbose > 2)
+                       bb_info_msg("using filesystem type '%s' %s",
+                                       type, "(default)");
+       }
 
        num_running++;
-       retval = execute(type, fs->device, fs->mountpt, interactive);
-       if (retval) {
-               bb_error_msg("Error %d while executing fsck.%s for %s",
-                                               retval, type, fs->device);
-               num_running--;
-       }
+       execute(type, fs->device, fs->mountpt /*, interactive */);
 }
 
-
 /*
- * Deal with the fsck -t argument.
+ * Returns TRUE if a partition on the same disk is already being
+ * checked.
  */
-struct fs_type_compile {
-       char **list;
-       int *type;
-       int  negate;
-} fs_type_compiled;
-
-#define FS_TYPE_NORMAL  0
-#define FS_TYPE_OPT     1
-#define FS_TYPE_NEGOPT  2
+static int device_already_active(char *device)
+{
+       struct fsck_instance *inst;
+       char *base;
 
-static const char fs_type_syntax_error[] =
-"Either all or none of the filesystem types passed to -t must be prefixed\n"
-   "with 'no' or '!'.";
+       if (force_all_parallel)
+               return 0;
 
-static void compile_fs_type(char *fs_type, struct fs_type_compile *cmp)
-{
-       char    *cp, *list, *s;
-       int     num = 2;
-       int     negate, first_negate = 1;
-
-       if (fs_type) {
-               for (cp=fs_type; *cp; cp++) {
-                       if (*cp == ',')
-                               num++;
-               }
+#ifdef BASE_MD
+       /* Don't check a soft raid disk with any other disk */
+       if (instance_list
+        && (!strncmp(instance_list->device, BASE_MD, sizeof(BASE_MD)-1)
+            || !strncmp(device, BASE_MD, sizeof(BASE_MD)-1))
+       ) {
+               return 1;
        }
+#endif
 
-       cmp->list = xcalloc(num, sizeof(char *));
-       cmp->type = xcalloc(num, sizeof(int));
-       cmp->negate = 0;
-
-       if (!fs_type)
-               return;
+       base = base_device(device);
+       /*
+        * If we don't know the base device, assume that the device is
+        * already active if there are any fsck instances running.
+        */
+       if (!base)
+               return (instance_list != NULL);
 
-       list = string_copy(fs_type);
-       num = 0;
-       s = strtok(list, ",");
-       while(s) {
-               negate = 0;
-               if (strncmp(s, "no", 2) == 0) {
-                       s += 2;
-                       negate = 1;
-               } else if (*s == '!') {
-                       s++;
-                       negate = 1;
-               }
-               if (strcmp(s, "loop") == 0)
-                       /* loop is really short-hand for opts=loop */
-                       goto loop_special_case;
-               else if (strncmp(s, "opts=", 5) == 0) {
-                       s += 5;
-               loop_special_case:
-                       cmp->type[num] = negate ? FS_TYPE_NEGOPT : FS_TYPE_OPT;
-               } else {
-                       if (first_negate) {
-                               cmp->negate = negate;
-                               first_negate = 0;
-                       }
-                       if ((negate && !cmp->negate) ||
-                           (!negate && cmp->negate)) {
-                               bb_error_msg_and_die("%s", fs_type_syntax_error);
-                       }
+       for (inst = instance_list; inst; inst = inst->next) {
+               if (!inst->base_device || !strcmp(base, inst->base_device)) {
+                       free(base);
+                       return 1;
                }
-#if 0
-               printf("Adding %s to list (type %d).\n", s, cmp->type[num]);
-#endif
-               cmp->list[num++] = string_copy(s);
-               s = strtok(NULL, ",");
        }
-       free(list);
+
+       free(base);
+       return 0;
 }
 
 /*
@@ -935,199 +638,157 @@ static void compile_fs_type(char *fs_type, struct fs_type_compile *cmp)
  */
 static int opt_in_list(char *opt, char *optlist)
 {
-       char    *list, *s;
+       char *s;
+       int len;
 
        if (!optlist)
                return 0;
-       list = string_copy(optlist);
 
-       s = strtok(list, ",");
-       while(s) {
-               if (strcmp(s, opt) == 0) {
-                       free(list);
-                       return 1;
-               }
-               s = strtok(NULL, ",");
+       len = strlen(opt);
+       s = optlist - 1;
+       while (1) {
+               s = strstr(s + 1, opt);
+               if (!s)
+                       return 0;
+               /* neither "opt.." nor "xxx,opt.."? */
+               if (s != optlist && s[-1] != ',')
+                       continue;
+               /* neither "..opt" nor "..opt,xxx"? */
+               if (s[len] != '\0' && s[len] != ',')
+                       continue;
+               return 1;
        }
-       free(list);
-       return 0;
 }
 
 /* See if the filesystem matches the criteria given by the -t option */
-static int fs_match(struct fs_info *fs, struct fs_type_compile *cmp)
+static int fs_match(struct fs_info *fs)
 {
-       int n, ret = 0, checked_type = 0;
+       int n, ret, checked_type;
        char *cp;
 
-       if (cmp->list == 0 || cmp->list[0] == 0)
+       if (!fs_type_list)
                return 1;
 
-       for (n=0; (cp = cmp->list[n]); n++) {
-               switch (cmp->type[n]) {
-               case FS_TYPE_NORMAL:
+       ret = 0;
+       checked_type = 0;
+       n = 0;
+       while (1) {
+               cp = fs_type_list[n];
+               if (!cp)
+                       break;
+               switch (fs_type_flag[n]) {
+               case FS_TYPE_FLAG_NORMAL:
                        checked_type++;
-                       if (strcmp(cp, fs->type) == 0) {
+                       if (strcmp(cp, fs->type) == 0)
                                ret = 1;
-                       }
                        break;
-               case FS_TYPE_NEGOPT:
+               case FS_TYPE_FLAG_NEGOPT:
                        if (opt_in_list(cp, fs->opts))
                                return 0;
                        break;
-               case FS_TYPE_OPT:
+               case FS_TYPE_FLAG_OPT:
                        if (!opt_in_list(cp, fs->opts))
                                return 0;
                        break;
                }
+               n++;
        }
        if (checked_type == 0)
                return 1;
-       return (cmp->negate ? !ret : ret);
+
+       return (fs_type_negated ? !ret : ret);
 }
 
 /* Check if we should ignore this filesystem. */
 static int ignore(struct fs_info *fs)
 {
-       int wanted;
-       char *s;
-
        /*
         * If the pass number is 0, ignore it.
         */
        if (fs->passno == 0)
                return 1;
 
-       interpret_type(fs);
-
        /*
         * If a specific fstype is specified, and it doesn't match,
         * ignore it.
         */
-       if (!fs_match(fs, &fs_type_compiled)) return 1;
+       if (!fs_match(fs))
+               return 1;
 
        /* Are we ignoring this type? */
-       if(compare_string_array(ignored_types, fs->type) >= 0)
+       if (index_in_strings(ignored_types, fs->type) >= 0)
                return 1;
 
-       /* Do we really really want to check this fs? */
-       wanted = compare_string_array(really_wanted, fs->type) >= 0;
-
-       /* See if the <fsck.fs> program is available. */
-       s = find_fsck(fs->type);
-       if (s == NULL) {
-               if (wanted)
-                       bb_error_msg("cannot check %s: fsck.%s not found",
-                               fs->device, fs->type);
-               return 1;
-       }
-       free(s);
-
        /* We can and want to check this file system type. */
        return 0;
 }
 
-/*
- * Returns TRUE if a partition on the same disk is already being
- * checked.
- */
-static int device_already_active(char *device)
-{
-       struct fsck_instance *inst;
-       char *base;
-
-       if (force_all_parallel)
-               return 0;
-
-#ifdef BASE_MD
-       /* Don't check a soft raid disk with any other disk */
-       if (instance_list &&
-           (!strncmp(instance_list->device, BASE_MD, sizeof(BASE_MD)-1) ||
-            !strncmp(device, BASE_MD, sizeof(BASE_MD)-1)))
-               return 1;
-#endif
-
-       base = base_device(device);
-       /*
-        * If we don't know the base device, assume that the device is
-        * already active if there are any fsck instances running.
-        */
-       if (!base)
-               return (instance_list != 0);
-       for (inst = instance_list; inst; inst = inst->next) {
-               if (!inst->base_device || !strcmp(base, inst->base_device)) {
-                       free(base);
-                       return 1;
-               }
-       }
-       free(base);
-       return 0;
-}
-
 /* Check all file systems, using the /etc/fstab table. */
 static int check_all(void)
 {
-       struct fs_info *fs = NULL;
+       struct fs_info *fs;
        int status = EXIT_OK;
-       int not_done_yet = 1;
-       int passno = 1;
-       int pass_done;
+       smallint not_done_yet;
+       smallint pass_done;
+       int passno;
 
        if (verbose)
-               fputs("Checking all file systems.\n", stdout);
+               puts("Checking all filesystems");
 
        /*
         * Do an initial scan over the filesystem; mark filesystems
         * which should be ignored as done, and resolve any "auto"
         * filesystem types (done as a side-effect of calling ignore()).
         */
-       for (fs = filesys_info; fs; fs = fs->next) {
+       for (fs = filesys_info; fs; fs = fs->next)
                if (ignore(fs))
                        fs->flags |= FLAG_DONE;
-       }
 
        /*
         * Find and check the root filesystem.
         */
        if (!parallel_root) {
                for (fs = filesys_info; fs; fs = fs->next) {
-                       if (!strcmp(fs->mountpt, "/"))
+                       if (LONE_CHAR(fs->mountpt, '/')) {
+                               if (!skip_root && !ignore(fs)) {
+                                       fsck_device(fs /*, 1*/);
+                                       status |= wait_many(FLAG_WAIT_ALL);
+                                       if (status > EXIT_NONDESTRUCT)
+                                               return status;
+                               }
+                               fs->flags |= FLAG_DONE;
                                break;
-               }
-               if (fs) {
-                       if (!skip_root && !ignore(fs)) {
-                               fsck_device(fs, 1);
-                               status |= wait_many(FLAG_WAIT_ALL);
-                               if (status > EXIT_NONDESTRUCT)
-                                       return status;
                        }
-                       fs->flags |= FLAG_DONE;
                }
        }
        /*
-        * This is for the bone-headed user who enters the root
-        * filesystem twice.  Skip root will skep all root entries.
+        * This is for the bone-headed user who has root
+        * filesystem listed twice.
+        * "Skip root" will skip _all_ root entries.
         */
        if (skip_root)
                for (fs = filesys_info; fs; fs = fs->next)
-                       if (!strcmp(fs->mountpt, "/"))
+                       if (LONE_CHAR(fs->mountpt, '/'))
                                fs->flags |= FLAG_DONE;
 
+       not_done_yet = 1;
+       passno = 1;
        while (not_done_yet) {
                not_done_yet = 0;
                pass_done = 1;
 
                for (fs = filesys_info; fs; fs = fs->next) {
-                       if (cancel_requested)
+                       if (bb_got_signal)
                                break;
                        if (fs->flags & FLAG_DONE)
                                continue;
                        /*
                         * If the filesystem's pass number is higher
-                        * than the current pass number, then we don't
+                        * than the current pass number, then we didn't
                         * do it yet.
                         */
                        if (fs->passno > passno) {
-                               not_done_yet++;
+                               not_done_yet = 1;
                                continue;
                        }
                        /*
@@ -1142,7 +803,7 @@ static int check_all(void)
                        /*
                         * Spawn off the fsck process
                         */
-                       fsck_device(fs, serialize);
+                       fsck_device(fs /*, serialize*/);
                        fs->flags |= FLAG_DONE;
 
                        /*
@@ -1150,13 +811,14 @@ static int check_all(void)
                         * have a limit on the number of fsck's extant
                         * at one time, apply that limit.
                         */
-                       if (serialize ||
-                           (max_running && (num_running >= max_running))) {
+                       if (serialize
+                        || (max_running && (num_running >= max_running))
+                       ) {
                                pass_done = 0;
                                break;
                        }
                }
-               if (cancel_requested)
+               if (bb_got_signal)
                        break;
                if (verbose > 1)
                        printf("--waiting-- (pass %d)\n", passno);
@@ -1164,249 +826,250 @@ static int check_all(void)
                                    FLAG_WAIT_ATLEAST_ONE);
                if (pass_done) {
                        if (verbose > 1)
-                               printf("----------------------------------\n");
+                               puts("----------------------------------");
                        passno++;
                } else
-                       not_done_yet++;
-       }
-       if (cancel_requested && !kill_sent) {
-               kill_all(SIGTERM);
-               kill_sent++;
+                       not_done_yet = 1;
        }
+       kill_all_if_got_signal();
        status |= wait_many(FLAG_WAIT_ATLEAST_ONE);
        return status;
 }
 
-#if 0
-static void usage(void)
+/*
+ * Deal with the fsck -t argument.
+ * Huh, for mount "-t novfat,nfs" means "neither vfat nor nfs"!
+ * Why here we require "-t novfat,nonfs" ??
+ */
+static void compile_fs_type(char *fs_type)
 {
-       fputs("Usage: fsck [-ANPRTV] [ -C [ fd ] ] [-t fstype] [fs-options] [filesys ...]\n", stderr);
-       exit(EXIT_USAGE);
+       char *s;
+       int num = 2;
+       smallint negate;
+
+       s = fs_type;
+       while ((s = strchr(s, ','))) {
+               num++;
+               s++;
+       }
+
+       fs_type_list = xzalloc(num * sizeof(fs_type_list[0]));
+       fs_type_flag = xzalloc(num * sizeof(fs_type_flag[0]));
+       fs_type_negated = -1; /* not yet known is it negated or not */
+
+       num = 0;
+       s = fs_type;
+       while (1) {
+               char *comma;
+
+               negate = 0;
+               if (s[0] == 'n' && s[1] == 'o') { /* "no.." */
+                       s += 2;
+                       negate = 1;
+               } else if (s[0] == '!') {
+                       s++;
+                       negate = 1;
+               }
+
+               if (strcmp(s, "loop") == 0)
+                       /* loop is really short-hand for opts=loop */
+                       goto loop_special_case;
+               if (strncmp(s, "opts=", 5) == 0) {
+                       s += 5;
+ loop_special_case:
+                       fs_type_flag[num] = negate ? FS_TYPE_FLAG_NEGOPT : FS_TYPE_FLAG_OPT;
+               } else {
+                       if (fs_type_negated == -1)
+                               fs_type_negated = negate;
+                       if (fs_type_negated != negate)
+                               bb_error_msg_and_die(
+"either all or none of the filesystem types passed to -t must be prefixed "
+"with 'no' or '!'");
+               }
+               comma = strchr(s, ',');
+               fs_type_list[num++] = comma ? xstrndup(s, comma-s) : xstrdup(s);
+               if (!comma)
+                       break;
+               s = comma + 1;
+       }
 }
-#endif
 
-static void signal_cancel(int sig FSCK_ATTR((unused)))
+static char **new_args(void)
 {
-       cancel_requested++;
+       args = xrealloc_vector(args, 2, num_args);
+       return &args[num_args++];
 }
 
-static void PRS(int argc, char *argv[])
+int fsck_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int fsck_main(int argc UNUSED_PARAM, char **argv)
 {
-       int     i, j;
-       char    *arg, *dev, *tmp = 0;
-       char    options[128];
-       int     opt = 0;
-       int     opts_for_fsck = 0;
-       struct sigaction        sa;
+       int i, status;
+       /*int interactive;*/
+       struct fs_info *fs;
+       const char *fstab;
+       char *tmp;
+       char **devices;
+       int num_devices;
+       smallint opts_for_fsck;
+       smallint doall;
+       smallint notitle;
 
-       /*
-        * Set up signal action
-        */
-       memset(&sa, 0, sizeof(struct sigaction));
-       sa.sa_handler = signal_cancel;
-       sigaction(SIGINT, &sa, 0);
-       sigaction(SIGTERM, &sa, 0);
+       /* we want wait() to be interruptible */
+       signal_no_SA_RESTART_empty_mask(SIGINT, record_signo);
+       signal_no_SA_RESTART_empty_mask(SIGTERM, record_signo);
 
+       setbuf(stdout, NULL);
+
+       opts_for_fsck = doall = notitle = 0;
+       devices = NULL;
        num_devices = 0;
-       num_args = 0;
-       instance_list = 0;
+       new_args(); /* args[0] = NULL, will be replaced by fsck.<type> */
+       /* instance_list = NULL; - in bss, so already zeroed */
 
-       for (i=1; i < argc; i++) {
-               arg = argv[i];
-               if (!arg)
-                       continue;
+       while (*++argv) {
+               int j;
+               int optpos;
+               char *options;
+               char *arg = *argv;
+
+               /* "/dev/blk" or "/path" or "UUID=xxx" or "LABEL=xxx" */
                if ((arg[0] == '/' && !opts_for_fsck) || strchr(arg, '=')) {
-                       if (num_devices >= MAX_DEVICES) {
-                               bb_error_msg_and_die("too many devices");
-                       }
-                       dev = blkid_get_devname(cache, arg, NULL);
-                       if (!dev && strchr(arg, '=')) {
-                               /*
-                                * Check to see if we failed because
-                                * /proc/partitions isn't found.
-                                */
-                               if (access("/proc/partitions", R_OK) < 0) {
-                                       bb_error_msg_and_die("Couldn't open /proc/partitions: %m\n"
-                                                       "Is /proc mounted?");
-                               }
-                               /*
-                                * Check to see if this is because
-                                * we're not running as root
-                                */
-                               if (geteuid())
-                                       bb_error_msg_and_die(
-               "Must be root to scan for matching filesystems: %s\n", arg);
-                               else
-                                       bb_error_msg_and_die(
-               "Couldn't find matching filesystem: %s", arg);
-                       }
-                       devices[num_devices++] = dev ? dev : string_copy(arg);
+// FIXME: must check that arg is a blkdev, or resolve
+// "/path", "UUID=xxx" or "LABEL=xxx" into block device name
+// ("UUID=xxx"/"LABEL=xxx" can probably shifted to fsck.auto duties)
+                       devices = xrealloc_vector(devices, 2, num_devices);
+                       devices[num_devices++] = arg;
                        continue;
                }
+
                if (arg[0] != '-' || opts_for_fsck) {
-                       if (num_args >= MAX_ARGS) {
-                               bb_error_msg_and_die("too many arguments");
-                       }
-                       args[num_args++] = string_copy(arg);
+                       *new_args() = arg;
                        continue;
                }
-               for (j=1; arg[j]; j++) {
-                       if (opts_for_fsck) {
-                               options[++opt] = arg[j];
-                               continue;
-                       }
+
+               if (LONE_CHAR(arg + 1, '-')) { /* "--" ? */
+                       opts_for_fsck = 1;
+                       continue;
+               }
+
+               optpos = 0;
+               options = NULL;
+               for (j = 1; arg[j]; j++) {
                        switch (arg[j]) {
                        case 'A':
-                               doall++;
+                               doall = 1;
                                break;
+#if DO_PROGRESS_INDICATOR
                        case 'C':
-                               progress++;
-                               if (arg[j+1]) {
-                                       progress_fd = string_to_int(arg+j+1);
-                                       if (progress_fd < 0)
-                                               progress_fd = 0;
-                                       else
-                                               goto next_arg;
-                               } else if ((i+1) < argc &&
-                                          !strncmp(argv[i+1], "-", 1) == 0) {
-                                       progress_fd = string_to_int(argv[i]);
-                                       if (progress_fd < 0)
-                                               progress_fd = 0;
-                                       else {
-                                               goto next_arg;
-                                               i++;
-                                       }
+                               progress = 1;
+                               if (arg[++j]) { /* -Cn */
+                                       progress_fd = xatoi_u(&arg[j]);
+                                       goto next_arg;
                                }
-                               break;
+                               /* -C n */
+                               if (!*++argv)
+                                       bb_show_usage();
+                               progress_fd = xatoi_u(*argv);
+                               goto next_arg;
+#endif
                        case 'V':
                                verbose++;
                                break;
                        case 'N':
-                               noexecute++;
+                               noexecute = 1;
                                break;
                        case 'R':
-                               skip_root++;
+                               skip_root = 1;
                                break;
                        case 'T':
-                               notitle++;
-                               break;
-                       case 'M':
-                               like_mount++;
+                               notitle = 1;
                                break;
+/*                     case 'M':
+                               like_mount = 1;
+                               break; */
                        case 'P':
-                               parallel_root++;
+                               parallel_root = 1;
                                break;
                        case 's':
-                               serialize++;
+                               serialize = 1;
                                break;
                        case 't':
-                               tmp = 0;
                                if (fstype)
-                                       usage();
-                               if (arg[j+1])
-                                       tmp = arg+j+1;
-                               else if ((i+1) < argc)
-                                       tmp = argv[++i];
+                                       bb_show_usage();
+                               if (arg[++j])
+                                       tmp = &arg[j];
+                               else if (*++argv)
+                                       tmp = *argv;
                                else
-                                       usage();
-                               fstype = string_copy(tmp);
-                               compile_fs_type(fstype, &fs_type_compiled);
+                                       bb_show_usage();
+                               fstype = xstrdup(tmp);
+                               compile_fs_type(fstype);
                                goto next_arg;
-                       case '-':
-                               opts_for_fsck++;
-                               break;
                        case '?':
-                               usage();
+                               bb_show_usage();
                                break;
                        default:
-                               options[++opt] = arg[j];
+                               optpos++;
+                               /* one extra for '\0' */
+                               options = xrealloc(options, optpos + 2);
+                               options[optpos] = arg[j];
                                break;
                        }
                }
      next_arg:
-               if (opt) {
+ next_arg:
+               if (optpos) {
                        options[0] = '-';
-                       options[++opt] = '\0';
-                       if (num_args >= MAX_ARGS) {
-                               bb_error_msg("too many arguments");
-                       }
-                       args[num_args++] = string_copy(options);
-                       opt = 0;
+                       options[optpos + 1] = '\0';
+                       *new_args() = options;
                }
        }
        if (getenv("FSCK_FORCE_ALL_PARALLEL"))
-               force_all_parallel++;
-       if ((tmp = getenv("FSCK_MAX_INST")))
-           max_running = atoi(tmp);
-}
-
-int fsck_main(int argc, char *argv[])
-{
-       int i, status = 0;
-       int interactive = 0;
-       const char *fstab;
-       struct fs_info *fs;
-
-       setvbuf(stdout, NULL, _IONBF, BUFSIZ);
-       setvbuf(stderr, NULL, _IONBF, BUFSIZ);
-
-       blkid_get_cache(&cache, NULL);
-       PRS(argc, argv);
+               force_all_parallel = 1;
+       tmp = getenv("FSCK_MAX_INST");
+       if (tmp)
+               max_running = xatoi(tmp);
+       new_args(); /* args[num_args - 2] will be replaced by <device> */
+       new_args(); /* args[num_args - 1] is the last, NULL element */
 
        if (!notitle)
-               printf("fsck %s (%s)\n", E2FSPROGS_VERSION, E2FSPROGS_DATE);
+               puts("fsck (busybox "BB_VER", "BB_BT")");
 
+       /* Even plain "fsck /dev/hda1" needs fstab to get fs type,
+        * so we are scanning it anyway */
        fstab = getenv("FSTAB_FILE");
        if (!fstab)
-               fstab = _PATH_MNTTAB;
+               fstab = "/etc/fstab";
        load_fs_info(fstab);
 
-       e2fs_set_sbin_path();
+       /*interactive = (num_devices == 1) | serialize;*/
 
-       if ((num_devices == 1) || (serialize))
-               interactive = 1;
-
-       /* If -A was specified ("check all"), do that! */
+       if (num_devices == 0)
+               /*interactive =*/ serialize = doall = 1;
        if (doall)
                return check_all();
 
-       if (num_devices == 0) {
-               serialize++;
-               interactive++;
-               return check_all();
-       }
-       for (i = 0 ; i < num_devices; i++) {
-               if (cancel_requested) {
-                       if (!kill_sent) {
-                               kill_all(SIGTERM);
-                               kill_sent++;
-                       }
+       status = 0;
+       for (i = 0; i < num_devices; i++) {
+               if (bb_got_signal) {
+                       kill_all_if_got_signal();
                        break;
                }
+
                fs = lookup(devices[i]);
-               if (!fs) {
-                       fs = create_fs_device(devices[i], 0, "auto",
-                                             0, -1, -1);
-                       if (!fs)
-                               continue;
-               }
-               fsck_device(fs, interactive);
-               if (serialize ||
-                   (max_running && (num_running >= max_running))) {
-                       struct fsck_instance *inst;
-
-                       inst = wait_one(0);
-                       if (inst) {
-                               status |= inst->exit_status;
-                               free_instance(inst);
-                       }
+               if (!fs)
+                       fs = create_fs_device(devices[i], "", "auto", NULL, -1);
+               fsck_device(fs /*, interactive */);
+
+               if (serialize
+                || (max_running && (num_running >= max_running))
+               ) {
+                       int exit_status = wait_one(0);
+                       if (exit_status >= 0)
+                               status |= exit_status;
                        if (verbose > 1)
-                               printf("----------------------------------\n");
+                               puts("----------------------------------");
                }
        }
        status |= wait_many(FLAG_WAIT_ALL);
-       if (ENABLE_FEATURE_CLEAN_UP)
-               free(fsck_path);
-       blkid_put_cache(cache);
        return status;
 }