Fix indenting.

Fix a bug noticed by Pete Flugstad.  Make certain we close what we open, and
don't try to close invalid files when /etc/filesystems exists and is used.


git-svn-id: svn://busybox.net/trunk/busybox@8061 69ca8d6d-28ef-0310-b511-8ec308f3f277

1 files changed, 5 insertions, 6 deletions

diff --git a/util-linux/mount.c b/util-linux/mount.c
index 15a0b5767..43856eace 100644
--- a/util-linux/mount.c
+++ b/util-linux/mount.c
@@ -273,8 +273,7 @@ static int mount_one(char *blockDevice, char *directory, char *filesystemType,
                                         filesystemType = buf;
 
                                         if (bb_strlen(filesystemType)) {
-                                                status =
-                                                        do_mount(blockDevice, directory, filesystemType,
+                                                status = do_mount(blockDevice, directory, filesystemType,
                                                                          flags | MS_MGC_VAL, string_flags,
                                                                          useMtab, fakeIt, mtab_opts, mount_all);
                                                 if (status) {
@@ -287,7 +286,8 @@ static int mount_one(char *blockDevice, char *directory, char *filesystemType,
                         fclose(f);
                 }
 
-                if ((!f || read_proc) && !status) {
+                if (read_proc && !status) {
+                        
                         f = bb_xfopen("/proc/filesystems", "r");
 
                         while (fgets(buf, sizeof(buf), f) != NULL) {
@@ -303,8 +303,7 @@ static int mount_one(char *blockDevice, char *directory, char *filesystemType,
                                         filesystemType = buf;
                                         filesystemType++;       /* hop past tab */
 
-                                        status =
-                                                do_mount(blockDevice, directory, filesystemType,
+                                        status = do_mount(blockDevice, directory, filesystemType,
                                                                  flags | MS_MGC_VAL, string_flags, useMtab,
                                                                  fakeIt, mtab_opts, mount_all);
                                         if (status) {
@@ -312,8 +311,8 @@ static int mount_one(char *blockDevice, char *directory, char *filesystemType,
                                         }
                                 }
                         }
+                        fclose(f);
                 }
-                fclose(f);
         } else {
                 status =
                         do_mount(blockDevice, directory, filesystemType,