*
*/
-#include "busybox.h"
#include <stdio.h>
#include <mntent.h>
#include <errno.h>
#include <string.h>
#include <stdlib.h>
+#include "busybox.h"
static const int MNT_FORCE = 1;
#if defined BB_FEATURE_MOUNT_LOOP
static int freeLoop = TRUE;
#endif
+#if defined BB_FEATURE_MTAB_SUPPORT
static int useMtab = TRUE;
+#endif
static int umountAll = FALSE;
static int doRemount = FALSE;
extern const char mtab_file[]; /* Defined in utility.c */
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 */
}
#endif
-static int do_umount(const char *name, int useMtab)
+static int do_umount(const char *name)
{
int status;
char *blockDevice = mtab_getinfo(name, MTAB_GETDEVICE);
}
}
if (status == 0) {
-#if defined BB_MTAB
+#if defined BB_FEATURE_MTAB_SUPPORT
if (useMtab == TRUE)
erase_mtab(name);
#endif
return (FALSE);
}
-static int umount_all(int useMtab)
+static int umount_all(void)
{
int status = TRUE;
char *mountpt;
/* Never umount /proc on a umount -a */
if (strstr(mountpt, "proc")!= NULL)
continue;
- if (!do_umount(mountpt, useMtab)) {
+ if (!do_umount(mountpt)) {
/* Don't bother retrying the umount on busy devices */
if (errno == EBUSY) {
perror_msg("%s", mountpt);
status = FALSE;
continue;
}
- if (!do_umount(mountpt, useMtab)) {
+ if (!do_umount(mountpt)) {
printf("Couldn't umount %s on %s: %s\n",
mountpt, mtab_getinfo(mountpt, MTAB_GETDEVICE),
strerror(errno));
freeLoop = FALSE;
break;
#endif
-#ifdef BB_MTAB
+#ifdef BB_FEATURE_MTAB_SUPPORT
case 'n':
useMtab = FALSE;
break;
mtab_read();
if (umountAll == TRUE) {
- if (umount_all(useMtab) == TRUE)
+ if (umount_all() == TRUE)
return EXIT_SUCCESS;
else
return EXIT_FAILURE;
}
- if (do_umount(*argv, useMtab) == TRUE)
+ if (do_umount(*argv) == TRUE)
return EXIT_SUCCESS;
perror_msg_and_die("%s", *argv);
}