Apple-2gs-SW/hush
1
0
Fork 0
mirror of https://github.com/sheumann/hush.git synced 2025-01-13 21:31:51 +00:00
Code Issues Projects Releases Wiki Activity

Move the mtab support stuff into libbb

Browse Source 
-Erik
This commit is contained in:
Eric Andersen 2001-04-01 16:01:11 +00:00
parent f77d88641d
commit c4cef5ab06
14 changed files with 23 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Config.h
View File

@ -210,7 +210,7 @@
#define BB_FEATURE_MOUNT_LOOP #define BB_FEATURE_MOUNT_LOOP
// //
// Enable support for a real /etc/mtab file instead of /proc/mounts // 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. // Enable support for mounting remote NFS volumes.
// You may need to mount with "-o nolock" if you are // You may need to mount with "-o nolock" if you are
@ -345,14 +345,6 @@
// Nothing beyond this point should ever be touched by // Nothing beyond this point should ever be touched by
// mere mortals so leave this stuff alone. // 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_SH
#if defined BB_FEATURE_COMMAND_EDITING #if defined BB_FEATURE_COMMAND_EDITING
#define BB_CMDEDIT #define BB_CMDEDIT

4
Makefile
View File

@ -202,7 +202,7 @@ endif
# And option 4: # And option 4:
-include applet_source_list -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 += $(CROSS_CFLAGS)
CFLAGS += -DBB_VER='"$(VERSION)"' CFLAGS += -DBB_VER='"$(VERSION)"'
CFLAGS += -DBB_BT='"$(BUILDTIME)"' 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 \ 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 \ 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 \ 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_OBJS=$(patsubst %.c,$(LIBBB)/%.o, $(LIBBB_CSRC))
LIBBB_CFLAGS = -I$(LIBBB_DIR) LIBBB_CFLAGS = -I$(LIBBB_DIR)

2
applets/usage.h
View File

@ -1067,7 +1067,7 @@
#else #else
#define USAGE_MOUNT_LOOP(a) #define USAGE_MOUNT_LOOP(a)
#endif #endif
#ifdef BB_MTAB #ifdef BB_FEATURE_MTAB_SUPPORT
#define USAGE_MTAB(a) a #define USAGE_MTAB(a) a
#else #else
#define USAGE_MTAB(a) #define USAGE_MTAB(a)

10
debian/Config.h-deb vendored
View File

@ -208,7 +208,7 @@
#define BB_FEATURE_MOUNT_LOOP #define BB_FEATURE_MOUNT_LOOP
// //
// Enable support for a real /etc/mtab file instead of /proc/mounts // 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. // Enable support for mounting remote NFS volumes.
// You may need to mount with "-o nolock" if you are // You may need to mount with "-o nolock" if you are
@ -343,14 +343,6 @@
// Nothing beyond this point should ever be touched by // Nothing beyond this point should ever be touched by
// mere mortals so leave this stuff alone. // 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_SH
#if defined BB_FEATURE_COMMAND_EDITING #if defined BB_FEATURE_COMMAND_EDITING
#define BB_CMDEDIT #define BB_CMDEDIT

10
debian/Config.h-static vendored
View File

@ -208,7 +208,7 @@
#define BB_FEATURE_MOUNT_LOOP #define BB_FEATURE_MOUNT_LOOP
// //
// Enable support for a real /etc/mtab file instead of /proc/mounts // 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. // Enable support for mounting remote NFS volumes.
// You may need to mount with "-o nolock" if you are // You may need to mount with "-o nolock" if you are
@ -343,14 +343,6 @@
// Nothing beyond this point should ever be touched by // Nothing beyond this point should ever be touched by
// mere mortals so leave this stuff alone. // 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_SH
#if defined BB_FEATURE_COMMAND_EDITING #if defined BB_FEATURE_COMMAND_EDITING
#define BB_CMDEDIT #define BB_CMDEDIT

10
debian/Config.h-udeb vendored
View File

@ -208,7 +208,7 @@
#define BB_FEATURE_MOUNT_LOOP #define BB_FEATURE_MOUNT_LOOP
// //
// Enable support for a real /etc/mtab file instead of /proc/mounts // 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. // Enable support for mounting remote NFS volumes.
// You may need to mount with "-o nolock" if you are // You may need to mount with "-o nolock" if you are
@ -343,14 +343,6 @@
// Nothing beyond this point should ever be touched by // Nothing beyond this point should ever be touched by
// mere mortals so leave this stuff alone. // 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_SH
#if defined BB_FEATURE_COMMAND_EDITING #if defined BB_FEATURE_COMMAND_EDITING
#define BB_CMDEDIT #define BB_CMDEDIT

2
include/usage.h
View File

@ -1067,7 +1067,7 @@
#else #else
#define USAGE_MOUNT_LOOP(a) #define USAGE_MOUNT_LOOP(a)
#endif #endif
#ifdef BB_MTAB #ifdef BB_FEATURE_MTAB_SUPPORT
#define USAGE_MTAB(a) a #define USAGE_MTAB(a) a
#else #else
#define USAGE_MTAB(a) #define USAGE_MTAB(a)

2
mtab.c → libbb/mtab.c
View File

@ -5,7 +5,7 @@
#include <string.h> #include <string.h>
#include <stdio.h> #include <stdio.h>
#include <mntent.h> #include <mntent.h>
#include "busybox.h" #include "libbb.h"
extern const char mtab_file[]; /* Defined in utility.c */ extern const char mtab_file[]; /* Defined in utility.c */
static const int MS_RDONLY = 1; /* Mount read-only. */ static const int MS_RDONLY = 1; /* Mount read-only. */

2
mtab_file.c → libbb/mtab_file.c
View File

@ -26,7 +26,7 @@
*/ */
#include <stdio.h> #include <stdio.h>
#include "busybox.h" #include "libbb.h"
/* Busybox mount uses either /proc/mounts or /dev/mtab to /* Busybox mount uses either /proc/mounts or /dev/mtab to

4
mount.c
View File

@ -160,7 +160,7 @@ do_mount(char *specialfile, char *dir, char *filesystemtype,
/* If the mount was sucessful, do anything needed, then return TRUE */ /* If the mount was sucessful, do anything needed, then return TRUE */
if (status == 0 || fakeIt==TRUE) { if (status == 0 || fakeIt==TRUE) {
#if defined BB_MTAB #if defined BB_FEATURE_MTAB_SUPPORT
if (useMtab == TRUE) { if (useMtab == TRUE) {
erase_mtab(specialfile); // Clean any stale entries erase_mtab(specialfile); // Clean any stale entries
write_mtab(specialfile, dir, filesystemtype, flags, mtab_opts); write_mtab(specialfile, dir, filesystemtype, flags, mtab_opts);
@ -385,7 +385,7 @@ extern int mount_main(int argc, char **argv)
case 'f': case 'f':
fakeIt = TRUE; fakeIt = TRUE;
break; break;
#ifdef BB_MTAB #ifdef BB_FEATURE_MTAB_SUPPORT
case 'n': case 'n':
useMtab = FALSE; useMtab = FALSE;
break; break;

8
umount.c
View File

@ -57,7 +57,7 @@ static int doForce = FALSE;
#if defined BB_FEATURE_MOUNT_LOOP #if defined BB_FEATURE_MOUNT_LOOP
static int freeLoop = TRUE; static int freeLoop = TRUE;
#endif #endif
#if defined BB_MTAB #if defined BB_FEATURE_MTAB_SUPPORT
static int useMtab = TRUE; static int useMtab = TRUE;
#endif #endif
static int umountAll = FALSE; static int umountAll = FALSE;
@ -106,7 +106,7 @@ char *mtab_getinfo(const char *match, const char which)
if (which == MTAB_GETMOUNTPT) { if (which == MTAB_GETMOUNTPT) {
return cur->mountpt; return cur->mountpt;
} else { } else {
#if !defined BB_MTAB #if !defined BB_FEATURE_MTAB_SUPPORT
if (strcmp(cur->device, "/dev/root") == 0) { if (strcmp(cur->device, "/dev/root") == 0) {
/* Adjusts device to be the real root device, /* Adjusts device to be the real root device,
* or leaves device alone if it can't find it */ * 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 (status == 0) {
#if defined BB_MTAB #if defined BB_FEATURE_MTAB_SUPPORT
if (useMtab == TRUE) if (useMtab == TRUE)
erase_mtab(name); erase_mtab(name);
#endif #endif
@ -255,7 +255,7 @@ extern int umount_main(int argc, char **argv)
freeLoop = FALSE; freeLoop = FALSE;
break; break;
#endif #endif
#ifdef BB_MTAB #ifdef BB_FEATURE_MTAB_SUPPORT
case 'n': case 'n':
useMtab = FALSE; useMtab = FALSE;
break; break;

2
usage.h
View File

@ -1067,7 +1067,7 @@
#else #else
#define USAGE_MOUNT_LOOP(a) #define USAGE_MOUNT_LOOP(a)
#endif #endif
#ifdef BB_MTAB #ifdef BB_FEATURE_MTAB_SUPPORT
#define USAGE_MTAB(a) a #define USAGE_MTAB(a) a
#else #else
#define USAGE_MTAB(a) #define USAGE_MTAB(a)

4
util-linux/mount.c
View File

@ -160,7 +160,7 @@ do_mount(char *specialfile, char *dir, char *filesystemtype,
/* If the mount was sucessful, do anything needed, then return TRUE */ /* If the mount was sucessful, do anything needed, then return TRUE */
if (status == 0 || fakeIt==TRUE) { if (status == 0 || fakeIt==TRUE) {
#if defined BB_MTAB #if defined BB_FEATURE_MTAB_SUPPORT
if (useMtab == TRUE) { if (useMtab == TRUE) {
erase_mtab(specialfile); // Clean any stale entries erase_mtab(specialfile); // Clean any stale entries
write_mtab(specialfile, dir, filesystemtype, flags, mtab_opts); write_mtab(specialfile, dir, filesystemtype, flags, mtab_opts);
@ -385,7 +385,7 @@ extern int mount_main(int argc, char **argv)
case 'f': case 'f':
fakeIt = TRUE; fakeIt = TRUE;
break; break;
#ifdef BB_MTAB #ifdef BB_FEATURE_MTAB_SUPPORT
case 'n': case 'n':
useMtab = FALSE; useMtab = FALSE;
break; break;

8
util-linux/umount.c
View File

@ -57,7 +57,7 @@ static int doForce = FALSE;
#if defined BB_FEATURE_MOUNT_LOOP #if defined BB_FEATURE_MOUNT_LOOP
static int freeLoop = TRUE; static int freeLoop = TRUE;
#endif #endif
#if defined BB_MTAB #if defined BB_FEATURE_MTAB_SUPPORT
static int useMtab = TRUE; static int useMtab = TRUE;
#endif #endif
static int umountAll = FALSE; static int umountAll = FALSE;
@ -106,7 +106,7 @@ char *mtab_getinfo(const char *match, const char which)
if (which == MTAB_GETMOUNTPT) { if (which == MTAB_GETMOUNTPT) {
return cur->mountpt; return cur->mountpt;
} else { } else {
#if !defined BB_MTAB #if !defined BB_FEATURE_MTAB_SUPPORT
if (strcmp(cur->device, "/dev/root") == 0) { if (strcmp(cur->device, "/dev/root") == 0) {
/* Adjusts device to be the real root device, /* Adjusts device to be the real root device,
* or leaves device alone if it can't find it */ * 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 (status == 0) {
#if defined BB_MTAB #if defined BB_FEATURE_MTAB_SUPPORT
if (useMtab == TRUE) if (useMtab == TRUE)
erase_mtab(name); erase_mtab(name);
#endif #endif
@ -255,7 +255,7 @@ extern int umount_main(int argc, char **argv)
freeLoop = FALSE; freeLoop = FALSE;
break; break;
#endif #endif
#ifdef BB_MTAB #ifdef BB_FEATURE_MTAB_SUPPORT
case 'n': case 'n':
useMtab = FALSE; useMtab = FALSE;
break; break;