Use tab not space
[oweals/busybox.git] / util-linux / mount.c
index 4b0901f2a3c1144b4afc74fbbadffba3bb5984eb..35fd3032375330c27fb4ca0ba24968b62b7838f4 100644 (file)
@@ -1,7 +1,9 @@
+/* vi: set sw=4 ts=4: */
 /*
  * Mini mount implementation for busybox
  *
  * Copyright (C) 1995, 1996 by Bruce Perens <bruce@pixar.com>.
+ * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  *
  * 1999-04-17  Dave Cinege...Rewrote -t auto. Fixed ro mtab.
  *
- * 1999-10-07  Erik Andersen <andersen@lineo.com>, <andersee@debian.org>.
+ * 1999-10-07  Erik Andersen <andersen@codepoet.org>.
  *              Rewrite of a lot of code. Removed mtab usage (I plan on
- *              putting it back as a compile-time option some time), 
- *              major adjustments to option parsing, and some serious 
+ *              putting it back as a compile-time option some time),
+ *              major adjustments to option parsing, and some serious
  *              dieting all around.
  *
- * 1999-11-06  mtab suppport is back - andersee
+ * 1999-11-06  mtab support is back - andersee
  *
  * 2000-01-12   Ben Collins <bcollins@debian.org>, Borrowed utils-linux's
  *              mount to add loop support.
+ *
+ * 2000-04-30  Dave Cinege <dcinege@psychosis.com>
+ *             Rewrote fstab while loop and lower mount section. Can now do
+ *             single mounts from fstab. Can override fstab options for single
+ *             mount. Common mount_one call for single mounts and 'all'. Fixed
+ *             mtab updating and stale entries. Removed 'remount' default.
+ *
  */
 
-#include "internal.h"
+#include <limits.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <errno.h>
 #include <string.h>
 #include <stdio.h>
 #include <mntent.h>
-#include <sys/mount.h>
 #include <ctype.h>
-#include <fstab.h>
-
-#if defined BB_FEATURE_MOUNT_LOOP
-#include <fcntl.h>
-#include <sys/ioctl.h>
-#include <linux/loop.h>
+#include "busybox.h"
 
-
-static int use_loop = 0;
+#ifdef CONFIG_NFSMOUNT
+#if defined(__UCLIBC__) && ! defined(__UCLIBC_HAS_RPC__)
+#error "You need to build uClibc with UCLIBC_HAS_RPC for busybox mount with NFS support to compile."
+#endif
 #endif
 
-extern const char mtab_file[]; /* Defined in utility.c */
+enum {
+       MS_MGC_VAL = 0xc0ed0000,        /* Magic number indicatng "new" flags */
+       MS_RDONLY = 1,          /* Mount read-only */
+       MS_NOSUID = 2,          /* Ignore suid and sgid bits */
+       MS_NODEV = 4,           /* Disallow access to device special files */
+       MS_NOEXEC = 8,          /* Disallow program execution */
+       MS_SYNCHRONOUS = 16,    /* Writes are synced at once */
+       MS_REMOUNT = 32,        /* Alter flags of a mounted FS */
+       MS_MANDLOCK = 64,       /* Allow mandatory locks on an FS */
+       S_QUOTA = 128,          /* Quota initialized for file/directory/symlink */
+       S_APPEND = 256,         /* Append-only file */
+       S_IMMUTABLE = 512,      /* Immutable file */
+       MS_NOATIME = 1024,      /* Do not update access times. */
+       MS_NODIRATIME = 2048,   /* Do not update directory access times */
+       MS_BIND = 4096,         /* Use the new linux 2.4.x "mount --bind" feature */
+};
 
-static const char mount_usage[] = "\tmount [flags]\n"
-    "\tmount [flags] device directory [-o options,more-options]\n"
-    "\n"
-    "Flags:\n"
-    "\t-a:\tMount all file systems in fstab.\n"
-#ifdef BB_MTAB
-    "\t-f:\t\"Fake\" mount. Add entry to mount table but don't mount it.\n"
-    "\t-n:\tDon't write a mount table entry.\n"
-#endif
-    "\t-o option:\tOne of many filesystem options, listed below.\n"
-    "\t-r:\tMount the filesystem read-only.\n"
-    "\t-t filesystem-type:\tSpecify the filesystem type.\n"
-    "\t-w:\tMount for reading and writing (default).\n"
-    "\n"
-    "Options for use with the \"-o\" flag:\n"
-    "\tasync / sync:\tWrites are asynchronous / synchronous.\n"
-    "\tdev / nodev:\tAllow use of special device files / disallow them.\n"
-    "\texec / noexec:\tAllow use of executable files / disallow them.\n"
-#if defined BB_FEATURE_MOUNT_LOOP
-    "\tloop: Mounts a file via loop device.\n"
+
+#if defined CONFIG_FEATURE_MOUNT_LOOP
+#include <fcntl.h>
+#include <sys/ioctl.h>
+static int use_loop = FALSE;
 #endif
-    "\tsuid / nosuid:\tAllow set-user-id-root programs / disallow them.\n"
-    "\tremount: Re-mount a currently-mounted filesystem, changing its flags.\n"
-    "\tro / rw: Mount for read-only / read-write.\n"
-    "\t"
-    "There are EVEN MORE flags that are specific to each filesystem.\n"
-    "You'll have to see the written documentation for those.\n";
 
+extern int mount(__const char *__special_file, __const char *__dir,
+                                __const char *__fstype, unsigned long int __rwflag,
+                                __const void *__data);
+extern int umount(__const char *__special_file);
+extern int umount2(__const char *__special_file, int __flags);
+
+extern int sysfs(int option, unsigned int fs_index, char *buf);
 
 struct mount_options {
-    const char *name;
-    unsigned long and;
-    unsigned long or;
+       const char *name;
+       unsigned long and;
+       unsigned long or;
 };
 
 static const struct mount_options mount_options[] = {
-    {"async", ~MS_SYNCHRONOUS, 0},
-    {"defaults", ~0, 0},
-    {"dev", ~MS_NODEV, 0},
-    {"exec", ~MS_NOEXEC, 0},
-    {"nodev", ~0, MS_NODEV},
-    {"noexec", ~0, MS_NOEXEC},
-    {"nosuid", ~0, MS_NOSUID},
-    {"remount", ~0, MS_REMOUNT},
-    {"ro", ~0, MS_RDONLY},
-    {"rw", ~MS_RDONLY, 0},
-    {"suid", ~MS_NOSUID, 0},
-    {"sync", ~0, MS_SYNCHRONOUS},
-    {0, 0, 0}
+       {"async", ~MS_SYNCHRONOUS, 0},
+       {"atime", ~0, ~MS_NOATIME},
+       {"defaults", ~0, 0},
+       {"noauto", ~0, 0},
+       {"dev", ~MS_NODEV, 0},
+       {"diratime", ~0, ~MS_NODIRATIME},
+       {"exec", ~MS_NOEXEC, 0},
+       {"noatime", ~0, MS_NOATIME},
+       {"nodev", ~0, MS_NODEV},
+       {"nodiratime", ~0, MS_NODIRATIME},
+       {"noexec", ~0, MS_NOEXEC},
+       {"nosuid", ~0, MS_NOSUID},
+       {"remount", ~0, MS_REMOUNT},
+       {"ro", ~0, MS_RDONLY},
+       {"rw", ~MS_RDONLY, 0},
+       {"suid", ~MS_NOSUID, 0},
+       {"sync", ~0, MS_SYNCHRONOUS},
+       {"bind", ~0, MS_BIND},
+       {0, 0, 0}
 };
 
 static int
-do_mount(char* specialfile, char* dir, char* filesystemtype, 
-       long flags, void* string_flags, int useMtab, int fakeIt, char* mtab_opts)
+do_mount(char *specialfile, char *dir, char *filesystemtype, long flags,
+                void *string_flags, int useMtab, int fakeIt, char *mtab_opts,
+                int mount_all)
 {
-    int status=0;
+       int status = 0;
 
-#if defined BB_MTAB
-    if (fakeIt==FALSE)
+#if defined CONFIG_FEATURE_MOUNT_LOOP
+       char *lofile = NULL;
 #endif
-    {
-#if defined BB_FEATURE_MOUNT_LOOP
-       if (use_loop) {
-           int loro = flags & MS_RDONLY;
-           char *lofile = specialfile;
-           specialfile = find_unused_loop_device();
-           if (specialfile == NULL) {
-               fprintf(stderr, "Could not find a spare loop device\n");
-               return( FALSE);
-           }
-           if (set_loop (specialfile, lofile, 0, &loro)) {
-               fprintf(stderr, "Could not setup loop device\n");
-               return( FALSE);
-           }
-           if (!(flags & MS_RDONLY) && loro) { /* loop is ro, but wanted rw */
-               fprintf(stderr, "WARNING: loop device is read-only\n");
-               flags &= ~MS_RDONLY;
-           }
-       }
+
+       if (!fakeIt) {
+#if defined CONFIG_FEATURE_MOUNT_LOOP
+               if (use_loop == TRUE) {
+                       int loro = flags & MS_RDONLY;
+
+                       lofile = specialfile;
+
+                       specialfile = find_unused_loop_device();
+                       if (specialfile == NULL) {
+                               bb_error_msg_and_die("Could not find a spare loop device");
+                       }
+                       if (set_loop(specialfile, lofile, 0, &loro)) {
+                               bb_error_msg_and_die("Could not setup loop device");
+                       }
+                       if (!(flags & MS_RDONLY) && loro) {     /* loop is ro, but wanted rw */
+                               bb_error_msg("WARNING: loop device is read-only");
+                               flags |= MS_RDONLY;
+                       }
+               }
 #endif
-       status=mount(specialfile, dir, filesystemtype, flags, string_flags);
-    }
+               status = mount(specialfile, dir, filesystemtype, flags, string_flags);
+               if (status < 0 && errno == EROFS) {
+                       bb_error_msg("%s is write-protected, mounting read-only",
+                                         specialfile);
+                       status = mount(specialfile, dir, filesystemtype, flags |=
+                                                  MS_RDONLY, string_flags);
+               }
+               /* Don't whine about already mounted filesystems when mounting all. */
+               if (status < 0 && errno == EBUSY && mount_all) {
+                       return TRUE;
+               }
+       }
 
 
-    /* If the mount was sucessful, do anything needed, then return TRUE */
-    if (status == 0) {
+       /* If the mount was sucessful, do anything needed, then return TRUE */
+       if (status == 0 || fakeIt == TRUE) {
 
-#if defined BB_MTAB
-       if (useMtab==TRUE) {
-           write_mtab(specialfile, dir, filesystemtype, flags, mtab_opts);
-       }
+#if defined CONFIG_FEATURE_MTAB_SUPPORT
+               if (useMtab) {
+                       erase_mtab(specialfile);        /* Clean any stale entries */
+                       write_mtab(specialfile, dir, filesystemtype, flags, mtab_opts);
+               }
 #endif
-       return( TRUE);
-    }
-
-    /* Bummer.  mount failed.  Clean up */
-#if defined BB_FEATURE_MOUNT_LOOP
-    if (specialfile != NULL) {
-       del_loop(specialfile);
-    }
+               return (TRUE);
+       }
+
+       /* Bummer.  mount failed.  Clean up */
+#if defined CONFIG_FEATURE_MOUNT_LOOP
+       if (lofile != NULL) {
+               del_loop(specialfile);
+       }
 #endif
-    return( FALSE);
-}
 
+       if (errno == EPERM) {
+               bb_error_msg_and_die(bb_msg_perm_denied_are_you_root);
+       }
+
+       return (FALSE);
+}
 
 
-#if defined BB_MTAB
-#define whine_if_fstab_is_missing() {} 
-#else
-extern void whine_if_fstab_is_missing()
+static void paste_str(char **s1, const char *s2)
 {
-    struct stat statBuf;
-    if (stat("/etc/fstab", &statBuf) < 0) 
-       fprintf(stderr, "/etc/fstab file missing -- install one to name /dev/root.\n\n");
+       *s1 = xrealloc(*s1, strlen(*s1) + strlen(s2) + 1);
+       strcat(*s1, s2);
 }
-#endif
-
 
 /* Seperate standard mount options from the nonstandard string options */
-static void
-parse_mount_options ( char *options, unsigned long *flags, char *strflags)
+static void parse_mount_options(char *options, int *flags, char **strflags)
 {
-    while (options) {
-       int gotone=FALSE;
-       char *comma = strchr (options, ',');
-       const struct mount_options* f = mount_options;
-       if (comma)
-           *comma = '\0';
-
-       while (f->name != 0) {
-           if (strcasecmp (f->name, options) == 0) {
-
-               *flags &= f->and;
-               *flags |= f->or;
-               gotone=TRUE;
-               break;
-           }
-           f++;
-       }
-#if defined BB_FEATURE_MOUNT_LOOP
-       if (gotone==FALSE && !strcasecmp ("loop", options)) { /* loop device support */
-           use_loop = 1;
-           gotone=TRUE;
-       }
+       while (options) {
+               int gotone = FALSE;
+               char *comma = strchr(options, ',');
+               const struct mount_options *f = mount_options;
+
+               if (comma) {
+                       *comma = '\0';
+               }
+
+               while (f->name != 0) {
+                       if (strcasecmp(f->name, options) == 0) {
+
+                               *flags &= f->and;
+                               *flags |= f->or;
+                               gotone = TRUE;
+                               break;
+                       }
+                       f++;
+               }
+#if defined CONFIG_FEATURE_MOUNT_LOOP
+               if (!strcasecmp("loop", options)) {     /* loop device support */
+                       use_loop = TRUE;
+                       gotone = TRUE;
+               }
 #endif
-       if (*strflags && strflags!= '\0' && gotone==FALSE) {
-           char *temp=strflags;
-           temp += strlen (strflags);
-           *temp++ = ',';
-           *temp++ = '\0';
-       }
-       if (gotone==FALSE)
-           strcat (strflags, options);
-       if (comma) {
-           *comma = ',';
-           options = ++comma;
-       } else {
-           break;
+               if (!gotone) {
+                       if (**strflags) {
+                               /* have previous parsed options */
+                               paste_str(strflags, ",");
+                       }
+                       paste_str(strflags, options);
+               }
+               if (comma) {
+                       *comma = ',';
+                       options = ++comma;
+               } else {
+                       break;
+               }
        }
-    }
 }
 
-int
-mount_one(char *blockDevice, char *directory, char *filesystemType,
-          unsigned long flags, char *string_flags, int useMtab, int fakeIt, char *mtab_opts)
+static int mount_one(char *blockDevice, char *directory, char *filesystemType,
+                                        unsigned long flags, char *string_flags, int useMtab,
+                                        int fakeIt, char *mtab_opts, int whineOnErrors,
+                                        int mount_all)
 {
-    int status = 0;
+       int status = 0;
+       if (strcmp(filesystemType, "auto") == 0) {
+               char buf[255];
+               FILE *f;
+               int read_proc = 0;
+
+               f = fopen("/etc/filesystems", "r");
+
+               if (f) {
+                       while (fgets(buf, sizeof(buf), f)) {
+                               if (*buf == '*') {
+                                       read_proc = 1;
+                               } else if (*buf == '#') {
+                                       continue;
+                               } else {
+                                       filesystemType = buf;
+
+                                       /* Add NULL termination to each line */
+                                       while (*filesystemType && !isspace(*filesystemType)) {
+                                               filesystemType++;
+                                       }
+                                       *filesystemType = '\0';
+
+                                       filesystemType = buf;
+
+                                       if (bb_strlen(filesystemType)) {
+                                               status = do_mount(blockDevice, directory, filesystemType,
+                                                                        flags | MS_MGC_VAL, string_flags,
+                                                                        useMtab, fakeIt, mtab_opts, mount_all);
+                                               if (status) {
+                                                       break;
+                                               }
+                                       }
+
+                               }
+                       }
+                       fclose(f);
+               } else {
+                       read_proc = 1;
+               }
 
-    char buf[255];
+               if (read_proc && !status) {
 
-#if defined BB_FEATURE_USE_PROCFS
-    if (strcmp(filesystemType, "auto") == 0) {
-       FILE *f = fopen ("/proc/filesystems", "r");
+                       f = bb_xfopen("/proc/filesystems", "r");
 
-       if (f == NULL)
-           return( FALSE);
+                       while (fgets(buf, sizeof(buf), f) != NULL) {
+                               filesystemType = buf;
+                               if (*filesystemType == '\t') {  /* Not a nodev filesystem */
 
-       while (fgets (buf, sizeof (buf), f) != NULL) {
-           filesystemType = buf;
-           if (*filesystemType == '\t') {      // Not a nodev filesystem
+                                       /* Add NULL termination to each line */
+                                       while (*filesystemType && *filesystemType != '\n') {
+                                               filesystemType++;
+                                       }
+                                       *filesystemType = '\0';
 
-               // Add NULL termination to each line
-               while (*filesystemType && *filesystemType != '\n')
-                   filesystemType++;
-               *filesystemType = '\0';
+                                       filesystemType = buf;
+                                       filesystemType++;       /* hop past tab */
 
-               filesystemType = buf;
-               filesystemType++;       // hop past tab
+                                       status = do_mount(blockDevice, directory, filesystemType,
+                                                                flags | MS_MGC_VAL, string_flags, useMtab,
+                                                                fakeIt, mtab_opts, mount_all);
+                                       if (status) {
+                                               break;
+                                       }
+                               }
+                       }
+                       fclose(f);
+               }
+       } else {
+               status = do_mount(blockDevice, directory, filesystemType,
+                                        flags | MS_MGC_VAL, string_flags, useMtab, fakeIt,
+                                        mtab_opts, mount_all);
+       }
 
-               status = do_mount (blockDevice, directory, filesystemType,
-                               flags | MS_MGC_VAL, string_flags, useMtab, 
-                               fakeIt, mtab_opts);
-               if (status == TRUE)
-                   break;
-           }
+       if (!status) {
+               if (whineOnErrors) {
+                       bb_perror_msg("Mounting %s on %s failed", blockDevice, directory);
+               }
+               return (FALSE);
        }
-       fclose (f);
-    } else
-#endif
-    {
-       status = do_mount (blockDevice, directory, filesystemType,
-                       flags | MS_MGC_VAL, string_flags, useMtab, 
-                       fakeIt, mtab_opts);
-    }
-
-    if (status==FALSE) {
-       fprintf (stderr, "Mounting %s on %s failed: %s\n",
-                blockDevice, directory, strerror(errno));
-       return (FALSE);
-    }
-    return (TRUE);
+       return (TRUE);
 }
 
-extern int mount_main (int argc, char **argv)
+static void show_mounts(char *onlytype)
 {
-    char string_flags_buf[1024]="";
-    char *string_flags = string_flags_buf;
-    char *extra_opts = string_flags_buf;
-    unsigned long flags = 0;
-    char *filesystemType = "auto";
-    char *device = NULL;
-    char *directory = NULL;
-    int all = FALSE;
-    int fakeIt = FALSE;
-    int useMtab = TRUE;
-    int i;
-
-    /* Only compiled in if BB_MTAB is not defined */
-    whine_if_fstab_is_missing();
-
-    if (argc == 1) {
-       FILE *mountTable = setmntent (mtab_file, "r");
+       FILE *mountTable = setmntent(bb_path_mtab_file, "r");
+
        if (mountTable) {
-           struct mntent *m;
-           while ((m = getmntent (mountTable)) != 0) {
-               struct fstab* fstabItem;
-               char *blockDevice = m->mnt_fsname;
-               /* Note that if /etc/fstab is missing, libc can't fix up /dev/root for us */
-               if (strcmp (blockDevice, "/dev/root") == 0) {
-                   fstabItem = getfsfile ("/");
-                   if (fstabItem != NULL)
-                       blockDevice = fstabItem->fs_spec;
+               struct mntent *m;
+
+               while ((m = getmntent(mountTable)) != 0) {
+                       char *blockDevice = m->mnt_fsname;
+
+                       if (strcmp(blockDevice, "rootfs") == 0) {
+                               continue;
+                       } else if (strcmp(blockDevice, "/dev/root") == 0) {
+                               blockDevice = find_real_root_device_name(blockDevice);
+                       }
+                       if (!onlytype || (strcmp(m->mnt_type, onlytype) == 0)) {
+                               printf("%s on %s type %s (%s)\n", blockDevice, m->mnt_dir,
+                                          m->mnt_type, m->mnt_opts);
+                       }
+#ifdef CONFIG_FEATURE_CLEAN_UP
+                       if (blockDevice != m->mnt_fsname) {
+                               free(blockDevice);
+                       }
+#endif
                }
-               printf ("%s on %s type %s (%s)\n", blockDevice, m->mnt_dir,
-                       m->mnt_type, m->mnt_opts);
-           }
-           endmntent (mountTable);
+               endmntent(mountTable);
        } else {
-           perror(mtab_file);
+               bb_perror_msg_and_die(bb_path_mtab_file);
        }
-       exit( TRUE);
-    }
-
-
-    /* Parse options */
-    i = --argc;
-    argv++;
-    while (i > 0 && **argv) {
-       if (**argv == '-') {
-           char *opt = *argv;
-           while (i>0 && *++opt) switch (*opt) {
-           case 'o':
-               if (--i == 0) {
-                   goto goodbye;
-               }
-               parse_mount_options (*(++argv), &flags, string_flags);
-               break;
-           case 'r':
-               flags |= MS_RDONLY;
-               break;
-           case 't':
-               if (--i == 0) {
-                   goto goodbye;
-               }
-               filesystemType = *(++argv);
-               break;
-           case 'w':
-               flags &= ~MS_RDONLY;
-               break;
-           case 'a':
-               all = TRUE;
-               break;
-#ifdef BB_MTAB
-           case 'f':
-               fakeIt = TRUE;
-               break;
-           case 'n':
-               useMtab = FALSE;
-               break;
+       exit(EXIT_SUCCESS);
+}
+
+extern int mount_main(int argc, char **argv)
+{
+       struct stat statbuf;
+       char *string_flags = bb_xstrdup("");
+       char *extra_opts;
+       int flags = 0;
+       char *filesystemType = "auto";
+       int got_filesystemType = 0;
+       char *device = xmalloc(PATH_MAX);
+       char *directory = xmalloc(PATH_MAX);
+       struct mntent *m = NULL;
+       int all = FALSE;
+       int fakeIt = FALSE;
+       int useMtab = TRUE;
+       int rc = EXIT_FAILURE;
+       FILE *f = 0;
+       int opt;
+
+       /* Parse options */
+       while ((opt = getopt(argc, argv, "o:rt:wafnv")) > 0) {
+               switch (opt) {
+               case 'o':
+                       parse_mount_options(optarg, &flags, &string_flags);
+                       break;
+               case 'r':
+                       flags |= MS_RDONLY;
+                       break;
+               case 't':
+                       filesystemType = optarg;
+                       got_filesystemType = 1;
+                       break;
+               case 'w':
+                       flags &= ~MS_RDONLY;
+                       break;
+               case 'a':
+                       all = TRUE;
+                       break;
+               case 'f':
+                       fakeIt = TRUE;
+                       break;
+               case 'n':
+#ifdef CONFIG_FEATURE_MTAB_SUPPORT
+                       useMtab = FALSE;
 #endif
-           case 'v':
-           case 'h':
-           case '-':
-               goto goodbye;
-           }
-       } else {
-           if (device == NULL)
-               device=*argv;
-           else if (directory == NULL)
-               directory=*argv;
-           else {
-               goto goodbye;
-           }
+                       break;
+               case 'v':
+                       break;          /* ignore -v */
+               }
        }
-       i--;
-       argv++;
-    }
 
-    if (all == TRUE) {
-       struct mntent *m;
-       FILE *f = setmntent ("/etc/fstab", "r");
-
-       if (f == NULL) {
-           perror("/etc/fstab");
-           exit( FALSE); 
+       if (!all && (optind == argc)) {
+               show_mounts(got_filesystemType ? filesystemType : NULL);
        }
-       while ((m = getmntent (f)) != NULL) {
-           // If the file system isn't noauto, and isn't mounted on /, 
-           // and isn't swap or nfs, then mount it
-           if ((!strstr (m->mnt_opts, "noauto")) &&
-                   (m->mnt_dir[1] != '\0') && 
-                   (!strstr (m->mnt_type, "swap")) && 
-                   (!strstr (m->mnt_type, "nfs"))) 
-           {
-               flags = 0;
-               *string_flags = '\0';
-               parse_mount_options(m->mnt_opts, &flags, string_flags);
-               mount_one (m->mnt_fsname, m->mnt_dir, m->mnt_type, 
-                       flags, string_flags, useMtab, fakeIt, extra_opts);
-           }
+
+       if (optind < argc) {
+               /* if device is a filename get its real path */
+               if (stat(argv[optind], &statbuf) == 0) {
+                       char *tmp = bb_simplify_path(argv[optind]);
+
+                       safe_strncpy(device, tmp, PATH_MAX);
+               } else {
+                       safe_strncpy(device, argv[optind], PATH_MAX);
+               }
        }
-       endmntent (f);
-    } else {
-       if (device && directory) {
-#ifdef BB_NFSMOUNT
-           if (strcmp(filesystemType, "nfs") == 0) {
-               if (nfsmount(device, directory, &flags, &extra_opts, &string_flags, 1) != 0)
-               exit(FALSE);
-           }
+
+       if (optind + 1 < argc)
+               directory = bb_simplify_path(argv[optind + 1]);
+
+       if (all || optind + 1 == argc) {
+               f = setmntent("/etc/fstab", "r");
+
+               if (f == NULL)
+                       bb_perror_msg_and_die("\nCannot read /etc/fstab");
+
+               while ((m = getmntent(f)) != NULL) {
+                       if (!all && (optind + 1 == argc)
+                               && ((strcmp(device, m->mnt_fsname) != 0)
+                                       && (strcmp(device, m->mnt_dir) != 0))) {
+                               continue;
+                       }
+
+                       if (all && (    /* If we're mounting 'all' */
+                                                  (strstr(m->mnt_opts, "noauto")) ||   /* and the file system isn't noauto, */
+                                                  (strstr(m->mnt_type, "swap")))) /* and isn't swap, then mount it */
+                       {
+                               continue;
+                       }
+
+                       if (all || flags == 0) {        /* Allow single mount to override fstab flags */
+                               flags = 0;
+                               string_flags[0] = 0;
+                               parse_mount_options(m->mnt_opts, &flags, &string_flags);
+                       }
+
+                       strcpy(device, m->mnt_fsname);
+                       strcpy(directory, m->mnt_dir);
+                       filesystemType = bb_xstrdup(m->mnt_type);
+                 singlemount:
+                       extra_opts = string_flags;
+                       rc = EXIT_SUCCESS;
+#ifdef CONFIG_NFSMOUNT
+                       if (strchr(device, ':') != NULL) {
+                               filesystemType = "nfs";
+                               if (nfsmount
+                                       (device, directory, &flags, &extra_opts, &string_flags,
+                                        1)) {
+                                       bb_perror_msg("nfsmount failed");
+                                       rc = EXIT_FAILURE;
+                               }
+                       }
 #endif
-           exit (mount_one (device, directory, filesystemType, 
-                       flags, string_flags, useMtab, fakeIt, extra_opts));
-       } else {
-           goto goodbye;
+                       if (!mount_one
+                               (device, directory, filesystemType, flags, string_flags,
+                                useMtab, fakeIt, extra_opts, TRUE, all)) {
+                               rc = EXIT_FAILURE;
+                       }
+                       if (!all) {
+                               break;
+                       }
+               }
+               if (f) {
+                       endmntent(f);
+               }
+               if (!all && f && m == NULL) {
+                       fprintf(stderr, "Can't find %s in /etc/fstab\n", device);
+               }
+               return rc;
        }
-    }
-    exit( TRUE);
 
-goodbye:
-    usage( mount_usage);
+       goto singlemount;
 }
-