Use tab not space

[oweals/busybox.git] / util-linux / mount.c

diff --git a/util-linux/mount.c b/util-linux/mount.c
index 43856eace36fa07043ddde90fa911248c1dad994..35fd3032375330c27fb4ca0ba24968b62b7838f4 100644 (file)
--- a/util-linux/mount.c
+++ b/util-linux/mount.c
@@ -3,7 +3,7 @@
  * Mini mount implementation for busybox
  *
  * Copyright (C) 1995, 1996 by Bruce Perens <bruce@pixar.com>.
- * Copyright (C) 1999-2003 by Erik Andersen <andersen@codepoet.org>
+ * 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
@@ -27,11 +27,11 @@
  *
  * 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.
@@ -40,8 +40,8 @@
  *             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. 
- *     
+ *             mtab updating and stale entries. Removed 'remount' default.
+ *
  */
 
 #include <limits.h>
@@ -284,10 +284,12 @@ static int mount_one(char *blockDevice, char *directory, char *filesystemType,
                                }
                        }
                        fclose(f);
+               } else {
+                       read_proc = 1;
                }
 
                if (read_proc && !status) {
-                       
+
                        f = bb_xfopen("/proc/filesystems", "r");
 
                        while (fgets(buf, sizeof(buf), f) != NULL) {
@@ -314,8 +316,7 @@ static int mount_one(char *blockDevice, char *directory, char *filesystemType,
                        fclose(f);
                }
        } else {
-               status =
-                       do_mount(blockDevice, directory, filesystemType,
+               status = do_mount(blockDevice, directory, filesystemType,
                                         flags | MS_MGC_VAL, string_flags, useMtab, fakeIt,
                                         mtab_opts, mount_all);
        }
@@ -401,11 +402,11 @@ extern int mount_main(int argc, char **argv)
                case 'f':
                        fakeIt = TRUE;
                        break;
-#ifdef CONFIG_FEATURE_MTAB_SUPPORT
                case 'n':
+#ifdef CONFIG_FEATURE_MTAB_SUPPORT
                        useMtab = FALSE;
-                       break;
 #endif
+                       break;
                case 'v':
                        break;          /* ignore -v */
                }