svn commit: trunk/busybox/util-linux

[andersen at busybox.net]

Author: andersen
Date: 2006-03-20 10:07:13 -0800 (Mon, 20 Mar 2006)
New Revision: 14583

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


Modified:
   trunk/busybox/util-linux/mount.c


Changeset:
Modified: trunk/busybox/util-linux/mount.c
===================================================================
--- trunk/busybox/util-linux/mount.c	2006-03-20 17:50:08 UTC (rev 14582)
+++ trunk/busybox/util-linux/mount.c	2006-03-20 18:07:13 UTC (rev 14583)
@@ -179,7 +179,6 @@
 
 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 @@
 
 #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 @@
 
 	parse_mount_options(mp->mnt_opts, &filteropts);
 
+	if (fakeIt) { return 0; }
+
 	// Mount, with fallback to read-only if necessary.
 
 	for(;;) {
@@ -333,8 +336,10 @@
 
 		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) {