Stephane Billiart noticed that the return code of the new mount was horked.
[oweals/busybox.git] / util-linux / mount.c
index c29be5106e1eb8a9c37567d82e65b07915e6e7d9..c3c13bae4db32f05da031f51a67fed0f8615c041 100644 (file)
@@ -3,6 +3,8 @@
  * 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>
+ * Copyright (C) 2005 by Rob Landley <rob@landley.net>
  *
  * 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
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  *
- * 3/21/1999   Charles P. Wright <cpwright@cpwright.com>
- *             searches through fstab when -a is passed
- *             will try mounting stuff with all fses when passed -t auto
- *
- * 1999-04-17  Dave Cinege...Rewrote -t auto. Fixed ro mtab.
- *
- * 1999-10-07  Erik Andersen <andersen@lineo.com>, <andersee@debian.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 
- *              dieting all around.
- *
- * 1999-11-06  mtab suppport is back - andersee
- *
- * 2000-01-12   Ben Collins <bcollins@debian.org>, Borrowed utils-linux's
- *              mount to add loop support.
  */
 
-#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_USE_DEVPS_PATCH
-#include <linux/devmtab.h>
-#endif
-
-
-#if defined BB_FEATURE_MOUNT_LOOP
-#include <fcntl.h>
-#include <sys/ioctl.h>
-#include <linux/loop.h>
-
-
-static int use_loop = FALSE;
+#include <sys/mount.h>
+#include <fcntl.h>             // for CONFIG_FEATURE_MOUNT_LOOP
+#include <sys/ioctl.h>  // for CONFIG_FEATURE_MOUNT_LOOP
+#include "busybox.h"
+
+/* This is just a warning of a common mistake.  Possibly this should be a
+ * uclibc faq entry rather than in busybox... */
+#if ENABLE_NFSMOUNT && 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
 
-extern const char mtab_file[]; /* Defined in utility.c */
-
-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"
+// These two aren't always defined in old headers
+#ifndef MS_BIND
+#define MS_BIND                4096
 #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"
+#ifndef MS_MOVE
+#define MS_MOVE                8192
 #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";
 
+/* Consume standard mount options (from -o options or --options).
+ * Set appropriate flags and collect unrecognized ones as a comma separated
+ * string to pass to kernel */ 
 
-struct mount_options {
+struct {
        const char *name;
-       unsigned long and;
-       unsigned long or;
+       long flags;
+} static const  mount_options[] = {
+       {"loop", 0},
+       {"defaults", 0},
+       {"noauto", 0},
+       {"ro", MS_RDONLY},
+       {"rw", ~MS_RDONLY},
+       {"nosuid", MS_NOSUID},
+       {"suid", ~MS_NOSUID},
+       {"dev", ~MS_NODEV},
+       {"nodev", MS_NODEV},
+       {"exec", ~MS_NOEXEC},
+       {"noexec", MS_NOEXEC},
+       {"sync", MS_SYNCHRONOUS},
+       {"async", ~MS_SYNCHRONOUS},
+       {"remount", MS_REMOUNT},
+       {"atime", MS_NOATIME},
+       {"noatime", MS_NOATIME},
+       {"diratime", MS_NODIRATIME},
+       {"nodiratime", MS_NODIRATIME},
+       {"bind", MS_BIND},
+       {"move", MS_MOVE}
 };
 
-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}
-};
-
-static int
-do_mount(char *specialfile, char *dir, char *filesystemtype,
-                long flags, void *string_flags, int useMtab, int fakeIt,
-                char *mtab_opts)
+/* Uses the mount_options list above */
+static void parse_mount_options(char *options, int *flags, char **strflags)
 {
-       int status = 0;
-       char *lofile = NULL;
+       // Loop through options
+       for(;;) {
+               int i;
+               char *comma = strchr(options, ',');
 
-#if defined BB_MTAB
-       if (fakeIt == FALSE)
-#endif
-       {
-#if defined BB_FEATURE_MOUNT_LOOP
-               if (use_loop==TRUE) {
-                       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(comma) *comma = 0;
+
+               // Find this option in mount_options
+               for(i = 0; i < (sizeof(mount_options) / sizeof(*mount_options)); i++) {
+                       if(!strcasecmp(mount_options[i].name, options)) {
+                               long fl = mount_options[i].flags;
+                               if(fl < 0) *flags &= fl;
+                               else *flags |= fl;
+                               break;
                        }
-                       use_loop = FALSE;
                }
-#endif
-               status =
-                       mount(specialfile, dir, filesystemtype, flags, string_flags);
+               // Unrecognized mount option?
+               if(i == sizeof(mount_options)) {
+                       // Add it to strflags, to pass on to kernel
+                       i = *strflags ? strlen(*strflags) : 0;
+                       *strflags = xrealloc(*strflags, i+strlen(options)+2);
+                       // Comma separated if it's not the first one
+                       if(i) (*strflags)[i] = ',';
+                       strcpy((*strflags)+i, options);
+               }
+               // Advance to next option, or finish
+               if(comma) {
+                       *comma = ',';
+                       options = ++comma;
+               } else break;
        }
+}
 
+/* This does the work */
 
-       /* If the mount was sucessful, do anything needed, then return TRUE */
-       if (status == 0) {
-
-#if defined BB_MTAB
-               if (useMtab == TRUE) {
-                       write_mtab(specialfile, dir, filesystemtype, flags, mtab_opts);
-               }
-#endif
-               return (TRUE);
+extern int mount_main(int argc, char **argv)
+{
+       char *string_flags = 0, *fsType = 0, *blockDevice = 0, *directory = 0,
+                *loopFile = 0, *buf = 0,
+                *files[] = {"/etc/filesystems", "/proc/filesystems", 0};
+       int i, opt, all = FALSE, fakeIt = FALSE, allowWrite = FALSE,
+               rc = 1, useMtab = ENABLE_FEATURE_MTAB_SUPPORT;
+       int flags=0xc0ed0000;   // Needed for linux 2.2, ignored by 2.4 and 2.6.
+       FILE *file = 0,*f = 0;
+       char path[PATH_MAX*2];
+       struct mntent m;
+       struct stat statbuf;
+
+       /* parse long options, like --bind and --move.  Note that -o option
+        * and --option are synonymous.  Yes, this means --remount,rw works. */
+
+       for(i = opt = 0; i < argc; i++) {
+               if(argv[i][0] == '-' && argv[i][1] == '-')
+                       parse_mount_options(argv[i]+2, &flags, &string_flags);
+               else argv[opt++] = argv[i];
        }
+       argc = opt;
 
-       /* Bummer.  mount failed.  Clean up */
-#if defined BB_FEATURE_MOUNT_LOOP
-       if (lofile != NULL) {
-               del_loop(specialfile);
-       }
-#endif
-       return (FALSE);
-}
+       // Parse remaining options
 
+       while((opt = getopt(argc, argv, "o:t:rwafnv")) > 0) {
+               switch (opt) {
+               case 'o':
+                       parse_mount_options(optarg, &flags, &string_flags);
+                       break;
+               case 't':
+                       fsType = optarg;
+                       break;
+               case 'r':
+                       flags |= MS_RDONLY;
+                       break;
+               case 'w':
+                       allowWrite=TRUE;
+                       break;
+               case 'a':
+                       all = TRUE;
+                       break;
+               case 'f':
+                       fakeIt = TRUE;
+                       break;
+               case 'n':
+                       useMtab = FALSE;
+                       break;
+               case 'v':
+                       break;          // ignore -v
+               default:
+                       bb_show_usage();
+               }
+       }
 
+       // If we have no arguments, show currently mounted filesystems
 
-/* Seperate standard mount options from the nonstandard string options */
-static void
-parse_mount_options(char *options, unsigned long *flags, char *strflags)
-{
-       while (options) {
-               int gotone = FALSE;
-               char *comma = strchr(options, ',');
-               const struct mount_options *f = mount_options;
+       if(!all && (optind == argc)) {
+               FILE *mountTable = setmntent(bb_path_mtab_file, "r");
 
-               if (comma)
-                       *comma = '\0';
+               if(!mountTable) bb_perror_msg_and_die(bb_path_mtab_file);
 
-               while (f->name != 0) {
-                       if (strcasecmp(f->name, options) == 0) {
+               while (getmntent_r(mountTable,&m,path,sizeof(path))) {
+                       blockDevice = m.mnt_fsname;
 
-                               *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 = TRUE;
-                       gotone = TRUE;
-               }
-#endif
-               if (*strflags && strflags != '\0' && gotone == FALSE) {
-                       char *temp = strflags;
+                       // Clean up display a little bit regarding root devie
+                       if(!strcmp(blockDevice, "rootfs")) continue;
+                       if(!strcmp(blockDevice, "/dev/root"))
+                               blockDevice = find_block_device("/");
 
-                       temp += strlen(strflags);
-                       *temp++ = ',';
-                       *temp++ = '\0';
-               }
-               if (gotone == FALSE)
-                       strcat(strflags, options);
-               if (comma) {
-                       *comma = ',';
-                       options = ++comma;
-               } else {
-                       break;
+                       if(!fsType || !strcmp(m.mnt_type, fsType))
+                               printf("%s on %s type %s (%s)\n", blockDevice, m.mnt_dir,
+                                          m.mnt_type, m.mnt_opts);
+                       if(ENABLE_FEATURE_CLEAN_UP && blockDevice != m.mnt_fsname)
+                               free(blockDevice);
                }
+               endmntent(mountTable);
+               return EXIT_SUCCESS;
        }
-}
 
-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 status = 0;
+       /* The next argument is what to mount.  if there's an argument after that
+        * it's where to mount it.  If we're not mounting all, and we have both
+        * of these arguments, jump straight to the actual mount. */
 
-#if defined BB_FEATURE_USE_PROCFS
-       char buf[255];
-       if (strcmp(filesystemType, "auto") == 0) {
-               FILE *f = fopen("/proc/filesystems", "r");
+       statbuf.st_mode=0;
+       if(optind < argc)
+               blockDevice = !stat(argv[optind], &statbuf) ?
+                               bb_simplify_path(argv[optind]) :
+                               (ENABLE_FEATURE_CLEAN_UP ? strdup(argv[optind]) : argv[optind]);
+       if(optind+1 < argc) directory = bb_simplify_path(argv[optind+1]);
 
-               if (f == NULL)
-                       return (FALSE);
+    // If we don't have to loop through fstab, skip ahead a bit.
 
-               while (fgets(buf, sizeof(buf), f) != NULL) {
-                       filesystemType = buf;
-                       if (*filesystemType == '\t') {  // Not a nodev filesystem
+       if(!all && optind+1!=argc) goto singlemount;
 
-                               // Add NULL termination to each line
-                               while (*filesystemType && *filesystemType != '\n')
-                                       filesystemType++;
-                               *filesystemType = '\0';
+       // Loop through /etc/fstab entries to look up this entry.
 
-                               filesystemType = buf;
-                               filesystemType++;       // hop past tab
+       if(!(file=setmntent("/etc/fstab","r")))
+               bb_perror_msg_and_die("\nCannot read /etc/fstab");
+       for(;;) {
 
-                               status = do_mount(blockDevice, directory, filesystemType,
-                                                                 flags | MS_MGC_VAL, string_flags,
-                                                                 useMtab, fakeIt, mtab_opts);
-                               if (status == TRUE)
-                                       break;
-                       }
+               // Get next fstab entry
+
+               if(!getmntent_r(file,&m,path,sizeof(path))) {
+                       if(!all)
+                               bb_perror_msg("Can't find %s in /etc/fstab\n", blockDevice);
+                       break;
                }
-               fclose(f);
-       } else
-#endif
-#if defined BB_FEATURE_USE_DEVPS_PATCH
-       if (strcmp(filesystemType, "auto") == 0) {
-               int fd, i, numfilesystems;
-               char device[] = "/dev/mtab";
-               struct k_fstype *fslist;
-
-               /* open device */ 
-               fd = open(device, O_RDONLY);
-               if (fd < 0)
-                       fatalError("open failed for `%s': %s\n", device, strerror (errno));
-
-               /* How many filesystems?  We need to know to allocate enough space */
-               numfilesystems = ioctl (fd, DEVMTAB_COUNT_FILESYSTEMS);
-               if (numfilesystems<0)
-                       fatalError("\nDEVMTAB_COUNT_FILESYSTEMS: %s\n", strerror (errno));
-               fslist = (struct k_fstype *) calloc ( numfilesystems, sizeof(struct k_fstype));
-
-               /* Grab the list of available filesystems */
-               status = ioctl (fd, DEVMTAB_GET_FILESYSTEMS, fslist);
-               if (status<0)
-                       fatalError("\nDEVMTAB_GET_FILESYSTEMS: %s\n", strerror (errno));
-
-               /* Walk the list trying to mount filesystems 
-                * that do not claim to be nodev filesystems */
-               for( i = 0 ; i < numfilesystems ; i++) {
-                       if (fslist[i].mnt_nodev)
+               
+               // If we're mounting all and all doesn't mount this one, skip it.
+
+               if(all) {
+                       if(strstr(m.mnt_opts,"noauto") || strstr(m.mnt_type,"swap"))
                                continue;
-                       status = do_mount(blockDevice, directory, fslist[i].mnt_type,
-                                                         flags | MS_MGC_VAL, string_flags,
-                                                         useMtab, fakeIt, mtab_opts);
-                       if (status == TRUE)
-                               break;
+                       flags=0;
+
+               /* If we're mounting something specific and this isn't it, skip it.
+                * Note we must match both the exact text in fstab (ala "proc") or
+                * a full path from root */
+
+               } else if(strcmp(blockDevice,m.mnt_fsname) &&
+                                 strcmp(argv[optind],m.mnt_fsname) &&
+                                 strcmp(blockDevice,m.mnt_dir) &&
+                                 strcmp(argv[optind],m.mnt_dir)) continue;
+
+               /* Parse flags from /etc/fstab (unless this is a single mount
+                * overriding fstab -- note the "all" test above zeroed the flags,
+                * to prevent flags from previous entries affecting this one, so
+                * the only way we could get here with nonzero flags is a single
+                * mount). */
+
+               if(!flags) {
+                       if(ENABLE_FEATURE_CLEAN_UP) free(string_flags);
+                       string_flags=NULL;
+                       parse_mount_options(m.mnt_opts, &flags, &string_flags);
                }
-               free( fslist);
-               close(fd);
-       } else
-#endif
-       {
-               status = do_mount(blockDevice, directory, filesystemType,
-                                                 flags | MS_MGC_VAL, string_flags, useMtab,
-                                                 fakeIt, mtab_opts);
-       }
 
-       if (status == FALSE && whineOnErrors == TRUE) {
-               if (whineOnErrors == TRUE) {
-                       fprintf(stderr, "Mounting %s on %s failed: %s\n",
-                                       blockDevice, directory, strerror(errno));
-               }
-               return (FALSE);
-       }
-       return (TRUE);
-}
+               /* Fill out remaining fields with info from mtab */
 
-extern int mount_main(int argc, char **argv)
-{
-       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 defined BB_FEATURE_USE_DEVPS_PATCH
-       if (argc == 1) {
-               int fd, i, numfilesystems;
-               char device[] = "/dev/mtab";
-               struct k_mntent *mntentlist;
-
-               /* open device */ 
-               fd = open(device, O_RDONLY);
-               if (fd < 0)
-                       fatalError("open failed for `%s': %s\n", device, strerror (errno));
-
-               /* How many mounted filesystems?  We need to know to 
-                * allocate enough space for later... */
-               numfilesystems = ioctl (fd, DEVMTAB_COUNT_MOUNTS);
-               if (numfilesystems<0)
-                       fatalError( "\nDEVMTAB_COUNT_MOUNTS: %s\n", strerror (errno));
-               mntentlist = (struct k_mntent *) calloc ( numfilesystems, sizeof(struct k_mntent));
-               
-               /* Grab the list of mounted filesystems */
-               if (ioctl (fd, DEVMTAB_GET_MOUNTS, mntentlist)<0)
-                       fatalError( "\nDEVMTAB_GET_MOUNTS: %s\n", strerror (errno));
-
-               for( i = 0 ; i < numfilesystems ; i++) {
-                       fprintf( stdout, "%s %s %s %s %d %d\n", mntentlist[i].mnt_fsname,
-                                       mntentlist[i].mnt_dir, mntentlist[i].mnt_type, 
-                                       mntentlist[i].mnt_opts, mntentlist[i].mnt_freq, 
-                                       mntentlist[i].mnt_passno);
-               }
-               free( mntentlist);
-               close(fd);
-               exit(TRUE);
-       }
-#else
-       if (argc == 1) {
-               FILE *mountTable = setmntent(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;
-                               }
-                               printf("%s on %s type %s (%s)\n", blockDevice, m->mnt_dir,
-                                          m->mnt_type, m->mnt_opts);
-                       }
-                       endmntent(mountTable);
+               if(ENABLE_FEATURE_CLEAN_UP) {
+                       free(blockDevice);
+                       blockDevice=strdup(m.mnt_fsname);
+                       free(directory);
+                       directory=strdup(m.mnt_type);
                } else {
-                       perror(mtab_file);
+                       blockDevice=m.mnt_fsname;
+                       directory=m.mnt_dir;
                }
-               exit(TRUE);
-       }
-#endif
+               fsType=m.mnt_type;
 
-       /* 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;
-#endif
-                               case 'v':
-                               case 'h':
-                               case '-':
-                                       goto goodbye;
-                               }
-               } else {
-                       if (device == NULL)
-                               device = *argv;
-                       else if (directory == NULL)
-                               directory = *argv;
+               /* Ok, we're ready to actually mount a specific source on a specific
+                * directory now. */
+
+singlemount:
+
+               // If they said -w, override fstab
+
+               if(allowWrite) flags&=~MS_RDONLY;
+
+               // Might this be an NFS filesystem?
+
+               if(ENABLE_NFSMOUNT && (!fsType || !strcmp(fsType,"nfs")) &&
+                       strchr(blockDevice, ':') != NULL)
+               {
+                       if(nfsmount(blockDevice, directory, &flags, &string_flags, 1))
+                               bb_perror_msg("nfsmount failed");
                        else {
-                               goto goodbye;
+                               rc = 0;
+                               fsType="nfs";
                        }
-               }
-               i--;
-               argv++;
-       }
-
-       if (all == TRUE) {
-               struct mntent *m;
-               FILE *f = setmntent("/etc/fstab", "r");
-
-               if (f == NULL)
-                       fatalError( "\nCannot ream /etc/fstab: %s\n", strerror (errno));
-
-               while ((m = getmntent(f)) != NULL) {
-                       // If the file system isn't noauto, 
-                       // and isn't swap or nfs, then mount it
-                       if ((!strstr(m->mnt_opts, "noauto")) &&
-                               (!strstr(m->mnt_type, "swap")) &&
-                               (!strstr(m->mnt_type, "nfs"))) {
-                               flags = 0;
-                               *string_flags = '\0';
-                               parse_mount_options(m->mnt_opts, &flags, string_flags);
-                               /* If the directory is /, try to remount
-                                * with the options specified in fstab */
-                               if (m->mnt_dir[0] == '/' && m->mnt_dir[1] == '\0') {
-                                       flags |= MS_REMOUNT;
+               } else {
+                       
+                       // Do we need to allocate a loopback device?
+
+                       if(ENABLE_FEATURE_MOUNT_LOOP && !fakeIt && S_ISREG(statbuf.st_mode))
+                       {
+                               loopFile = blockDevice;
+                               blockDevice = 0;
+                               switch(set_loop(&blockDevice, loopFile, 0)) {
+                                       case 0:
+                                       case 1:
+                                               break;
+                                       default:
+                                               bb_error_msg_and_die(
+                                                       errno == EPERM || errno == EACCES ?
+                                                       bb_msg_perm_denied_are_you_root :
+                                                       "Couldn't setup loop device");
+                                               break;
                                }
-                               if (mount_one(m->mnt_fsname, m->mnt_dir, m->mnt_type,
-                                                 flags, string_flags, useMtab, fakeIt,
-                                                 extra_opts, FALSE)) 
-                               {
-                                       /* Try again, but this time try a remount */
-                                       mount_one(m->mnt_fsname, m->mnt_dir, m->mnt_type,
-                                                         flags|MS_REMOUNT, string_flags, useMtab, fakeIt,
-                                                         extra_opts, TRUE);
+                       }
+
+                       /* If we know the fstype (or don't need to), jump straight
+                        * to the actual mount. */
+
+                       if(fsType || (flags & (MS_REMOUNT | MS_BIND | MS_MOVE)))
+                               goto mount_it_now;
+               }
+               
+               // Loop through filesystem types until mount succeeds or we run out
+
+               for(i = 0; files[i] && rc; i++) {
+                       f = fopen(files[i], "r");
+                       if(!f) continue;
+                       // Get next block device backed filesystem
+                       for(buf = 0; (buf = fsType = bb_get_chomped_line_from_file(f));
+                                       free(buf))
+                       {
+                               // Skip funky entries in /proc
+                               if(!strncmp(buf,"nodev",5) && isspace(buf[5])) continue;
+                               
+                               while(isspace(*fsType)) fsType++;
+                               if(*buf=='#' || *buf=='*') continue;
+                               if(!*fsType) continue;
+mount_it_now:
+                               // Okay, try to mount
+
+                               if (!fakeIt) {
+                                       for(;;) {
+                                               rc = mount(blockDevice, directory, fsType, flags, string_flags);
+                                               if(!rc || (flags&MS_RDONLY) || (errno!=EACCES && errno!=EROFS))
+                                                       break;
+                                               bb_error_msg("%s is write-protected, mounting read-only", blockDevice);
+                                               flags|=MS_RDONLY;
+                                       }
                                }
+                               if(!rc) break;
                        }
+                       if(f) fclose(f);
+                       if(!f || !rc) break;
                }
-               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 the mount was sucessful, and we're maintaining an old-style
+                * mtab file by hand, add new entry to it now. */
+               if((!rc || fakeIt) && useMtab) {
+                       FILE *mountTable = setmntent(bb_path_mtab_file, "a+");
+
+                       if(!mountTable) bb_perror_msg(bb_path_mtab_file);
+                       else {
+                               // Remove trailing / (if any) from directory we mounted on
+                               int length=strlen(directory);
+                               if(length>1 && directory[length-1] == '/')
+                                       directory[length-1]=0;
+
+                               // Fill out structure (should be ok to re-use existing one).
+                               m.mnt_fsname=blockDevice;
+                               m.mnt_dir=directory;
+                               m.mnt_type=fsType ? : "--bind";
+                               m.mnt_opts=string_flags ? :
+                                       ((flags & MS_RDONLY) ? "ro" : "rw");
+                               m.mnt_freq = 0;
+                               m.mnt_passno = 0;
+
+                               // Write and close
+                               addmntent(mountTable, &m);
+                               endmntent(mountTable);
                        }
-#endif
-                       exit(mount_one(device, directory, filesystemType,
-                                                  flags, string_flags, useMtab, fakeIt,
-                                                  extra_opts, TRUE));
                } else {
-                       goto goodbye;
+                       // Mount failed.  Clean up
+                       if(loopFile) {
+                               del_loop(blockDevice);
+                               if(ENABLE_FEATURE_CLEAN_UP) free(loopFile);
+                       }
+                       // Don't whine about already mounted fs when mounting all.
+                       if(rc<0 && errno == EBUSY && all) rc = 0;
+                       else if (errno == EPERM)
+                               bb_error_msg_and_die(bb_msg_perm_denied_are_you_root);
+               }
+               // We couldn't free this earlier becase fsType could be in buf.
+               if(ENABLE_FEATURE_CLEAN_UP) {
+                       free(buf);
+                       free(blockDevice);
+                       free(directory);
                }
+               if(!all) break;
        }
-       exit(TRUE);
 
-  goodbye:
-       usage(mount_usage);
+       if(file) endmntent(file);
+       if(rc) bb_perror_msg("Mounting %s on %s failed", blockDevice, directory);
+
+       return rc;
 }