#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
// 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
# 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)"'
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)
#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)
#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
// 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
#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
// 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
#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
// 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
#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)
--- /dev/null
+/* vi: set sw=4 ts=4: */
+#include <stdlib.h>
+#include <unistd.h>
+#include <errno.h>
+#include <string.h>
+#include <stdio.h>
+#include <mntent.h>
+#include "libbb.h"
+
+extern const char mtab_file[]; /* Defined in utility.c */
+static const int MS_RDONLY = 1; /* Mount read-only. */
+
+void erase_mtab(const char *name)
+{
+ struct mntent entries[20];
+ int count = 0;
+ FILE *mountTable = setmntent(mtab_file, "r");
+ struct mntent *m;
+
+ /* Check if reading the mtab file failed */
+ if (mountTable == 0
+ /* Bummer. fall back on trying the /proc filesystem */
+ && (mountTable = setmntent("/proc/mounts", "r")) == 0) {
+ perror_msg("%s", mtab_file);
+ return;
+ }
+
+ while ((m = getmntent(mountTable)) != 0) {
+ entries[count].mnt_fsname = strdup(m->mnt_fsname);
+ entries[count].mnt_dir = strdup(m->mnt_dir);
+ entries[count].mnt_type = strdup(m->mnt_type);
+ entries[count].mnt_opts = strdup(m->mnt_opts);
+ entries[count].mnt_freq = m->mnt_freq;
+ entries[count].mnt_passno = m->mnt_passno;
+ count++;
+ }
+ endmntent(mountTable);
+ if ((mountTable = setmntent(mtab_file, "w"))) {
+ int i;
+
+ for (i = 0; i < count; i++) {
+ int result = (strcmp(entries[i].mnt_fsname, name) == 0
+ || strcmp(entries[i].mnt_dir, name) == 0);
+
+ if (result)
+ continue;
+ else
+ addmntent(mountTable, &entries[i]);
+ }
+ endmntent(mountTable);
+ } else if (errno != EROFS)
+ perror_msg("%s", mtab_file);
+}
+
+void write_mtab(char *blockDevice, char *directory,
+ char *filesystemType, long flags, char *string_flags)
+{
+ FILE *mountTable = setmntent(mtab_file, "a+");
+ struct mntent m;
+
+ if (mountTable == 0) {
+ perror_msg("%s", mtab_file);
+ return;
+ }
+ if (mountTable) {
+ int length = strlen(directory);
+
+ if (length > 1 && directory[length - 1] == '/')
+ directory[length - 1] = '\0';
+
+ if (filesystemType == 0) {
+ struct mntent *p = find_mount_point(blockDevice, "/proc/mounts");
+
+ if (p && p->mnt_type)
+ filesystemType = p->mnt_type;
+ }
+ m.mnt_fsname = blockDevice;
+ m.mnt_dir = directory;
+ m.mnt_type = filesystemType ? filesystemType : "default";
+
+ if (*string_flags) {
+ m.mnt_opts = string_flags;
+ } else {
+ if ((flags | MS_RDONLY) == flags)
+ m.mnt_opts = "ro";
+ else
+ m.mnt_opts = "rw";
+ }
+
+ m.mnt_freq = 0;
+ m.mnt_passno = 0;
+ addmntent(mountTable, &m);
+ endmntent(mountTable);
+ }
+}
--- /dev/null
+/* vi: set sw=4 ts=4: */
+/*
+ * Utility routines.
+ *
+ * Copyright (C) tons of folks. Tracking down who wrote what
+ * isn't something I'm going to worry about... If you wrote something
+ * here, please feel free to acknowledge your work.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Based in part on code from sash, Copyright (c) 1999 by David I. Bell
+ * Permission has been granted to redistribute this code under the GPL.
+ *
+ */
+
+#include <stdio.h>
+#include "libbb.h"
+
+
+/* Busybox mount uses either /proc/mounts or /dev/mtab to
+ * get the list of currently mounted filesystems */
+#if defined BB_MTAB
+const char mtab_file[] = "/etc/mtab";
+#else
+# if defined BB_FEATURE_USE_DEVPS_PATCH
+ const char mtab_file[] = "/dev/mtab";
+# else
+ const char mtab_file[] = "/proc/mounts";
+# endif
+#endif
+
+
+/* END CODE */
+/*
+Local Variables:
+c-file-style: "linux"
+c-basic-offset: 4
+tab-width: 4
+End:
+*/
/* 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);
case 'f':
fakeIt = TRUE;
break;
-#ifdef BB_MTAB
+#ifdef BB_FEATURE_MTAB_SUPPORT
case 'n':
useMtab = FALSE;
break;
+++ /dev/null
-/* vi: set sw=4 ts=4: */
-#include <stdlib.h>
-#include <unistd.h>
-#include <errno.h>
-#include <string.h>
-#include <stdio.h>
-#include <mntent.h>
-#include "busybox.h"
-
-extern const char mtab_file[]; /* Defined in utility.c */
-static const int MS_RDONLY = 1; /* Mount read-only. */
-
-void erase_mtab(const char *name)
-{
- struct mntent entries[20];
- int count = 0;
- FILE *mountTable = setmntent(mtab_file, "r");
- struct mntent *m;
-
- /* Check if reading the mtab file failed */
- if (mountTable == 0
- /* Bummer. fall back on trying the /proc filesystem */
- && (mountTable = setmntent("/proc/mounts", "r")) == 0) {
- perror_msg("%s", mtab_file);
- return;
- }
-
- while ((m = getmntent(mountTable)) != 0) {
- entries[count].mnt_fsname = strdup(m->mnt_fsname);
- entries[count].mnt_dir = strdup(m->mnt_dir);
- entries[count].mnt_type = strdup(m->mnt_type);
- entries[count].mnt_opts = strdup(m->mnt_opts);
- entries[count].mnt_freq = m->mnt_freq;
- entries[count].mnt_passno = m->mnt_passno;
- count++;
- }
- endmntent(mountTable);
- if ((mountTable = setmntent(mtab_file, "w"))) {
- int i;
-
- for (i = 0; i < count; i++) {
- int result = (strcmp(entries[i].mnt_fsname, name) == 0
- || strcmp(entries[i].mnt_dir, name) == 0);
-
- if (result)
- continue;
- else
- addmntent(mountTable, &entries[i]);
- }
- endmntent(mountTable);
- } else if (errno != EROFS)
- perror_msg("%s", mtab_file);
-}
-
-void write_mtab(char *blockDevice, char *directory,
- char *filesystemType, long flags, char *string_flags)
-{
- FILE *mountTable = setmntent(mtab_file, "a+");
- struct mntent m;
-
- if (mountTable == 0) {
- perror_msg("%s", mtab_file);
- return;
- }
- if (mountTable) {
- int length = strlen(directory);
-
- if (length > 1 && directory[length - 1] == '/')
- directory[length - 1] = '\0';
-
- if (filesystemType == 0) {
- struct mntent *p = find_mount_point(blockDevice, "/proc/mounts");
-
- if (p && p->mnt_type)
- filesystemType = p->mnt_type;
- }
- m.mnt_fsname = blockDevice;
- m.mnt_dir = directory;
- m.mnt_type = filesystemType ? filesystemType : "default";
-
- if (*string_flags) {
- m.mnt_opts = string_flags;
- } else {
- if ((flags | MS_RDONLY) == flags)
- m.mnt_opts = "ro";
- else
- m.mnt_opts = "rw";
- }
-
- m.mnt_freq = 0;
- m.mnt_passno = 0;
- addmntent(mountTable, &m);
- endmntent(mountTable);
- }
-}
+++ /dev/null
-/* vi: set sw=4 ts=4: */
-/*
- * Utility routines.
- *
- * Copyright (C) tons of folks. Tracking down who wrote what
- * isn't something I'm going to worry about... If you wrote something
- * here, please feel free to acknowledge your work.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
- * Based in part on code from sash, Copyright (c) 1999 by David I. Bell
- * Permission has been granted to redistribute this code under the GPL.
- *
- */
-
-#include <stdio.h>
-#include "busybox.h"
-
-
-/* Busybox mount uses either /proc/mounts or /dev/mtab to
- * get the list of currently mounted filesystems */
-#if defined BB_MTAB
-const char mtab_file[] = "/etc/mtab";
-#else
-# if defined BB_FEATURE_USE_DEVPS_PATCH
- const char mtab_file[] = "/dev/mtab";
-# else
- const char mtab_file[] = "/proc/mounts";
-# endif
-#endif
-
-
-/* END CODE */
-/*
-Local Variables:
-c-file-style: "linux"
-c-basic-offset: 4
-tab-width: 4
-End:
-*/
#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;
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 */
}
}
if (status == 0) {
-#if defined BB_MTAB
+#if defined BB_FEATURE_MTAB_SUPPORT
if (useMtab == TRUE)
erase_mtab(name);
#endif
freeLoop = FALSE;
break;
#endif
-#ifdef BB_MTAB
+#ifdef BB_FEATURE_MTAB_SUPPORT
case 'n':
useMtab = FALSE;
break;
#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)
/* 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);
case 'f':
fakeIt = TRUE;
break;
-#ifdef BB_MTAB
+#ifdef BB_FEATURE_MTAB_SUPPORT
case 'n':
useMtab = FALSE;
break;
#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;
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 */
}
}
if (status == 0) {
-#if defined BB_MTAB
+#if defined BB_FEATURE_MTAB_SUPPORT
if (useMtab == TRUE)
erase_mtab(name);
#endif
freeLoop = FALSE;
break;
#endif
-#ifdef BB_MTAB
+#ifdef BB_FEATURE_MTAB_SUPPORT
case 'n':
useMtab = FALSE;
break;
projects / oweals / busybox.git / commitdiff