Fix some obvious compile problems. Make the -f' fakeIt option actually work.

diff --git a/util-linux/mount.c b/util-linux/mount.c
index 5ddf54cb1ab5d535640e1008190a74b73e438b46..4750989ce8d94cf764623f3b27a5e857cfc05d75 100644 (file)
--- a/util-linux/mount.c
+++ b/util-linux/mount.c
@@ -179,7 +179,6 @@ static llist_t *get_block_backed_filesystems(void)
 
 llist_t *fslist = 0;
 
-void delete_block_backed_filesystems(void);
 #if ENABLE_FEATURE_CLEAN_UP
 static void delete_block_backed_filesystems(void)
 {
@@ -189,8 +188,10 @@ static void delete_block_backed_filesystems(void)
 
 #if ENABLE_FEATURE_MTAB_SUPPORT
 static int useMtab;
+static int fakeIt;
 #else
 #define useMtab 0
+#define fakeIt 0
 #endif
 
 // Perform actual mount of specific filesystem at specific location.
@@ -202,6 +203,8 @@ static int mount_it_now(struct mntent *mp, int vfsflags)
 
        parse_mount_options(mp->mnt_opts, &filteropts);
 
+       if (fakeIt) { return 0; }
+
        // Mount, with fallback to read-only if necessary.
 
        for(;;) {
@@ -333,8 +336,10 @@ static int singlemount(struct mntent *mp)
 
                if (!fslist) {
                        fslist = get_block_backed_filesystems();
+#if ENABLE_FEATURE_CLEAN_UP
                        if (ENABLE_FEATURE_CLEAN_UP && fslist)
                                atexit(delete_block_backed_filesystems);
+#endif
                }
        
                for (fl = fslist; fl; fl = fl->link) {