Move the mtab support stuff into libbb

 -Erik

14 files changed, 23 insertions, 55 deletions

diff --git a/Config.h b/Config.h
index 8c7684876..bd6366558 100644
--- a/Config.h
+++ b/Config.h
@@ -210,7 +210,7 @@
 #define BB_FEATURE_MOUNT_LOOP
 //
 // Enable support for a real /etc/mtab file instead of /proc/mounts
-//#define BB_FEATURE_MOUNT_MTAB_SUPPORT
+//#define BB_FEATURE_MTAB_SUPPORT
 //
 // Enable support for mounting remote NFS volumes. 
 // You may need to mount with "-o nolock" if you are
@@ -345,14 +345,6 @@
 // Nothing beyond this point should ever be touched by 
 // mere mortals so leave this stuff alone.
 //
-#if defined BB_MOUNT || defined BB_UMOUNT || defined BB_DF
-	#ifdef BB_FEATURE_MOUNT_MTAB_SUPPORT
-		#define BB_MTAB
-	#endif
-#else
-	#undef BB_MTAB
-#endif	
-//
 #if defined BB_SH
 	#if defined BB_FEATURE_COMMAND_EDITING 
 		#define BB_CMDEDIT
diff --git a/Makefile b/Makefile
index ba2b2c3cb..231073a96 100644
--- a/Makefile
+++ b/Makefile
@@ -202,7 +202,7 @@ endif
 # And option 4:
 -include applet_source_list
 
-OBJECTS   = $(APPLET_SOURCES:.c=.o) busybox.o messages.o usage.o applets.o mtab_file.o
+OBJECTS   = $(APPLET_SOURCES:.c=.o) busybox.o messages.o usage.o applets.o
 CFLAGS    += $(CROSS_CFLAGS)
 CFLAGS    += -DBB_VER='"$(VERSION)"'
 CFLAGS    += -DBB_BT='"$(BUILDTIME)"'
@@ -236,7 +236,7 @@ my_getgrgid.c my_getpwnamegid.c my_getpwuid.c my_getgrnam.c my_getpwnam.c \
 recursive_action.c safe_read.c safe_strncpy.c syscalls.c \
 syslog_msg_with_name.c time_string.c trim.c vdprintf.c wfopen.c xfuncs.c \
 xregcomp.c error_msg_and_die.c perror_msg.c perror_msg_and_die.c \
-verror_msg.c vperror_msg.c 
+verror_msg.c vperror_msg.c mtab.c mtab_file.c
 LIBBB_OBJS=$(patsubst %.c,$(LIBBB)/%.o, $(LIBBB_CSRC))
 LIBBB_CFLAGS = -I$(LIBBB_DIR)
 
diff --git a/applets/usage.h b/applets/usage.h
index 32b34e45f..1ee2ab328 100644
--- a/applets/usage.h
+++ b/applets/usage.h
@@ -1067,7 +1067,7 @@
 #else
   #define USAGE_MOUNT_LOOP(a)
 #endif
-#ifdef BB_MTAB
+#ifdef BB_FEATURE_MTAB_SUPPORT
   #define USAGE_MTAB(a) a
 #else
   #define USAGE_MTAB(a)
diff --git a/debian/Config.h-deb b/debian/Config.h-deb
index 075e23557..606204bfe 100644
--- a/debian/Config.h-deb
+++ b/debian/Config.h-deb
@@ -208,7 +208,7 @@
 #define BB_FEATURE_MOUNT_LOOP
 //
 // Enable support for a real /etc/mtab file instead of /proc/mounts
-//#define BB_FEATURE_MOUNT_MTAB_SUPPORT
+//#define BB_FEATURE_MTAB_SUPPORT
 //
 // Enable support for mounting remote NFS volumes. 
 // You may need to mount with "-o nolock" if you are
@@ -343,14 +343,6 @@
 // Nothing beyond this point should ever be touched by 
 // mere mortals so leave this stuff alone.
 //
-#if defined BB_MOUNT || defined BB_UMOUNT || defined BB_DF
-	#ifdef BB_FEATURE_MOUNT_MTAB_SUPPORT
-		#define BB_MTAB
-	#endif
-#else
-	#undef BB_MTAB
-#endif	
-//
 #if defined BB_SH
 	#if defined BB_FEATURE_COMMAND_EDITING 
 		#define BB_CMDEDIT
diff --git a/debian/Config.h-static b/debian/Config.h-static
index fc89e329d..4cde55fda 100644
--- a/debian/Config.h-static
+++ b/debian/Config.h-static
@@ -208,7 +208,7 @@
 #define BB_FEATURE_MOUNT_LOOP
 //
 // Enable support for a real /etc/mtab file instead of /proc/mounts
-//#define BB_FEATURE_MOUNT_MTAB_SUPPORT
+//#define BB_FEATURE_MTAB_SUPPORT
 //
 // Enable support for mounting remote NFS volumes. 
 // You may need to mount with "-o nolock" if you are
@@ -343,14 +343,6 @@
 // Nothing beyond this point should ever be touched by 
 // mere mortals so leave this stuff alone.
 //
-#if defined BB_MOUNT || defined BB_UMOUNT || defined BB_DF
-	#ifdef BB_FEATURE_MOUNT_MTAB_SUPPORT
-		#define BB_MTAB
-	#endif
-#else
-	#undef BB_MTAB
-#endif	
-//
 #if defined BB_SH
 	#if defined BB_FEATURE_COMMAND_EDITING 
 		#define BB_CMDEDIT
diff --git a/debian/Config.h-udeb b/debian/Config.h-udeb
index 4028a71da..7aeba2873 100644
--- a/debian/Config.h-udeb
+++ b/debian/Config.h-udeb
@@ -208,7 +208,7 @@
 #define BB_FEATURE_MOUNT_LOOP
 //
 // Enable support for a real /etc/mtab file instead of /proc/mounts
-//#define BB_FEATURE_MOUNT_MTAB_SUPPORT
+//#define BB_FEATURE_MTAB_SUPPORT
 //
 // Enable support for mounting remote NFS volumes. 
 // You may need to mount with "-o nolock" if you are
@@ -343,14 +343,6 @@
 // Nothing beyond this point should ever be touched by 
 // mere mortals so leave this stuff alone.
 //
-#if defined BB_MOUNT || defined BB_UMOUNT || defined BB_DF
-	#ifdef BB_FEATURE_MOUNT_MTAB_SUPPORT
-		#define BB_MTAB
-	#endif
-#else
-	#undef BB_MTAB
-#endif	
-//
 #if defined BB_SH
 	#if defined BB_FEATURE_COMMAND_EDITING 
 		#define BB_CMDEDIT
diff --git a/include/usage.h b/include/usage.h
index 32b34e45f..1ee2ab328 100644
--- a/include/usage.h
+++ b/include/usage.h
@@ -1067,7 +1067,7 @@
 #else
   #define USAGE_MOUNT_LOOP(a)
 #endif
-#ifdef BB_MTAB
+#ifdef BB_FEATURE_MTAB_SUPPORT
   #define USAGE_MTAB(a) a
 #else
   #define USAGE_MTAB(a)
diff --git a/mtab.c b/libbb/mtab.c
index 049765775..28c9978ef 100644
--- a/mtab.c
+++ b/libbb/mtab.c
@@ -5,7 +5,7 @@
 #include <string.h>
 #include <stdio.h>
 #include <mntent.h>
-#include "busybox.h"
+#include "libbb.h"
 
 extern const char mtab_file[];	/* Defined in utility.c */
 static const int MS_RDONLY = 1;	/* Mount read-only.  */
diff --git a/mtab_file.c b/libbb/mtab_file.c
index 3235e35d6..d9c3de3c3 100644
--- a/mtab_file.c
+++ b/libbb/mtab_file.c
@@ -26,7 +26,7 @@
  */
 
 #include <stdio.h>
-#include "busybox.h"
+#include "libbb.h"
 
 
 /* Busybox mount uses either /proc/mounts or /dev/mtab to 
diff --git a/mount.c b/mount.c
index 9f7ac43c1..57dc73e55 100644
--- a/mount.c
+++ b/mount.c
@@ -160,7 +160,7 @@ do_mount(char *specialfile, char *dir, char *filesystemtype,
 	/* If the mount was sucessful, do anything needed, then return TRUE */
 	if (status == 0 || fakeIt==TRUE) {
 
-#if defined BB_MTAB
+#if defined BB_FEATURE_MTAB_SUPPORT
 		if (useMtab == TRUE) {
 			erase_mtab(specialfile);	// Clean any stale entries
 			write_mtab(specialfile, dir, filesystemtype, flags, mtab_opts);
@@ -385,7 +385,7 @@ extern int mount_main(int argc, char **argv)
 				case 'f':
 					fakeIt = TRUE;
 					break;
-#ifdef BB_MTAB
+#ifdef BB_FEATURE_MTAB_SUPPORT
 				case 'n':
 					useMtab = FALSE;
 					break;
diff --git a/umount.c b/umount.c
index cc7d38d7c..3e23b9705 100644
--- a/umount.c
+++ b/umount.c
@@ -57,7 +57,7 @@ static int doForce = FALSE;
 #if defined BB_FEATURE_MOUNT_LOOP
 static int freeLoop = TRUE;
 #endif
-#if defined BB_MTAB
+#if defined BB_FEATURE_MTAB_SUPPORT
 static int useMtab = TRUE;
 #endif
 static int umountAll = FALSE;
@@ -106,7 +106,7 @@ char *mtab_getinfo(const char *match, const char which)
 			if (which == MTAB_GETMOUNTPT) {
 				return cur->mountpt;
 			} else {
-#if !defined BB_MTAB
+#if !defined BB_FEATURE_MTAB_SUPPORT
 				if (strcmp(cur->device, "/dev/root") == 0) {
 					/* Adjusts device to be the real root device,
 					 * or leaves device alone if it can't find it */
@@ -197,7 +197,7 @@ static int do_umount(const char *name)
 		}
 	}
 	if (status == 0) {
-#if defined BB_MTAB
+#if defined BB_FEATURE_MTAB_SUPPORT
 		if (useMtab == TRUE)
 			erase_mtab(name);
 #endif
@@ -255,7 +255,7 @@ extern int umount_main(int argc, char **argv)
 				freeLoop = FALSE;
 				break;
 #endif
-#ifdef BB_MTAB
+#ifdef BB_FEATURE_MTAB_SUPPORT
 			case 'n':
 				useMtab = FALSE;
 				break;
diff --git a/usage.h b/usage.h
index 32b34e45f..1ee2ab328 100644
--- a/usage.h
+++ b/usage.h
@@ -1067,7 +1067,7 @@
 #else
   #define USAGE_MOUNT_LOOP(a)
 #endif
-#ifdef BB_MTAB
+#ifdef BB_FEATURE_MTAB_SUPPORT
   #define USAGE_MTAB(a) a
 #else
   #define USAGE_MTAB(a)
diff --git a/util-linux/mount.c b/util-linux/mount.c
index 9f7ac43c1..57dc73e55 100644
--- a/util-linux/mount.c
+++ b/util-linux/mount.c
@@ -160,7 +160,7 @@ do_mount(char *specialfile, char *dir, char *filesystemtype,
 	/* If the mount was sucessful, do anything needed, then return TRUE */
 	if (status == 0 || fakeIt==TRUE) {
 
-#if defined BB_MTAB
+#if defined BB_FEATURE_MTAB_SUPPORT
 		if (useMtab == TRUE) {
 			erase_mtab(specialfile);	// Clean any stale entries
 			write_mtab(specialfile, dir, filesystemtype, flags, mtab_opts);
@@ -385,7 +385,7 @@ extern int mount_main(int argc, char **argv)
 				case 'f':
 					fakeIt = TRUE;
 					break;
-#ifdef BB_MTAB
+#ifdef BB_FEATURE_MTAB_SUPPORT
 				case 'n':
 					useMtab = FALSE;
 					break;
diff --git a/util-linux/umount.c b/util-linux/umount.c
index cc7d38d7c..3e23b9705 100644
--- a/util-linux/umount.c
+++ b/util-linux/umount.c
@@ -57,7 +57,7 @@ static int doForce = FALSE;
 #if defined BB_FEATURE_MOUNT_LOOP
 static int freeLoop = TRUE;
 #endif
-#if defined BB_MTAB
+#if defined BB_FEATURE_MTAB_SUPPORT
 static int useMtab = TRUE;
 #endif
 static int umountAll = FALSE;
@@ -106,7 +106,7 @@ char *mtab_getinfo(const char *match, const char which)
 			if (which == MTAB_GETMOUNTPT) {
 				return cur->mountpt;
 			} else {
-#if !defined BB_MTAB
+#if !defined BB_FEATURE_MTAB_SUPPORT
 				if (strcmp(cur->device, "/dev/root") == 0) {
 					/* Adjusts device to be the real root device,
 					 * or leaves device alone if it can't find it */
@@ -197,7 +197,7 @@ static int do_umount(const char *name)
 		}
 	}
 	if (status == 0) {
-#if defined BB_MTAB
+#if defined BB_FEATURE_MTAB_SUPPORT
 		if (useMtab == TRUE)
 			erase_mtab(name);
 #endif
@@ -255,7 +255,7 @@ extern int umount_main(int argc, char **argv)
 				freeLoop = FALSE;
 				break;
 #endif
-#ifdef BB_MTAB
+#ifdef BB_FEATURE_MTAB_SUPPORT
 			case 'n':
 				useMtab = FALSE;
 				break;