* Mini umount implementation for busybox
*
*
- * Copyright (C) 1999 by Lineo, inc.
+ * Copyright (C) 1999,2000,2001 by Lineo, inc.
* Written by Erik Andersen <andersen@lineo.com>, <andersee@debian.org>
*
* This program is free software; you can redistribute it and/or modify
*
*/
-#include "internal.h"
+#include "busybox.h"
#include <stdio.h>
-#include <sys/mount.h>
#include <mntent.h>
#include <errno.h>
+#include <string.h>
+#include <stdlib.h>
-static const char umount_usage[] =
- "umount [flags] filesystem|directory\n\n"
- "Flags:\n" "\t-a:\tUnmount all file systems"
-#ifdef BB_MTAB
- " in /etc/mtab\n\t-n:\tDon't erase /etc/mtab entries\n"
-#else
- "\n"
-#endif
-#ifdef BB_FEATURE_REMOUNT
- "\t-r:\tTry to remount devices as read-only if mount is busy\n"
-#endif
-#if defined BB_FEATURE_MOUNT_LOOP
- "\t-f:\tDo not free loop device (if a loop device has been used)\n"
-#endif
-;
+static const int MNT_FORCE = 1;
+static const int MS_MGC_VAL = 0xc0ed0000; /* Magic number indicatng "new" flags */
+static const int MS_REMOUNT = 32; /* Alter flags of a mounted FS. */
+static const int MS_RDONLY = 1; /* Mount read-only. */
+
+extern int mount (__const char *__special_file, __const char *__dir,
+ __const char *__fstype, unsigned long int __rwflag,
+ __const void *__data);
+extern int umount (__const char *__special_file);
+extern int umount2 (__const char *__special_file, int __flags);
struct _mtab_entry_t {
char *device;
+#if defined BB_FEATURE_MOUNT_FORCE
+static int doForce = FALSE;
+#endif
#if defined BB_FEATURE_MOUNT_LOOP
static int freeLoop = TRUE;
#endif
static int useMtab = TRUE;
static int umountAll = FALSE;
-#if defined BB_FEATURE_REMOUNT
static int doRemount = FALSE;
-#endif
extern const char mtab_file[]; /* Defined in utility.c */
return;
if ((fp = setmntent(mtab_file, "r")) == NULL) {
- fprintf(stderr, "Cannot open %s\n", mtab_file);
+ error_msg("Cannot open %s", mtab_file);
return;
}
while ((e = getmntent(fp))) {
return mp;
}
+/* Don't bother to clean up, since exit() does that
+ * automagically, so we can save a few bytes */
+#ifdef BB_FEATURE_CLEAN_UP
void mtab_free(void)
{
struct _mtab_entry_t *this, *next;
this = next;
}
}
+#endif
static int do_umount(const char *name, int useMtab)
{
/* this was a loop device, delete it */
del_loop(blockDevice);
#endif
-#if defined BB_FEATURE_REMOUNT
+#if defined BB_FEATURE_MOUNT_FORCE
+ if (status != 0 && doForce == TRUE) {
+ status = umount2(blockDevice, MNT_FORCE);
+ if (status != 0) {
+ error_msg_and_die("forced umount of %s failed!", blockDevice);
+ }
+ }
+#endif
if (status != 0 && doRemount == TRUE && errno == EBUSY) {
status = mount(blockDevice, name, NULL,
MS_MGC_VAL | MS_REMOUNT | MS_RDONLY, NULL);
if (status == 0) {
- fprintf(stderr, "umount: %s busy - remounted read-only\n",
- blockDevice);
- /* TODO: update mtab if BB_MTAB is defined */
+ error_msg("%s busy - remounted read-only", blockDevice);
} else {
- fprintf(stderr, "umount: Cannot remount %s read-only\n",
- blockDevice);
+ error_msg("Cannot remount %s read-only", blockDevice);
}
}
-#endif
if (status == 0) {
#if defined BB_MTAB
if (useMtab == TRUE)
/* Never umount /proc on a umount -a */
if (strstr(mountpt, "proc")!= NULL)
continue;
- status = do_umount(mountpt, useMtab);
- if (status != 0) {
+ if (!do_umount(mountpt, useMtab)) {
/* Don't bother retrying the umount on busy devices */
if (errno == EBUSY) {
- perror(mountpt);
+ perror_msg("%s", mountpt);
+ status = FALSE;
continue;
}
- status = do_umount(mountpt, useMtab);
- if (status != 0) {
+ if (!do_umount(mountpt, useMtab)) {
printf("Couldn't umount %s on %s: %s\n",
mountpt, mtab_getinfo(mountpt, MTAB_GETDEVICE),
strerror(errno));
+ status = FALSE;
}
}
}
if (argc < 2) {
usage(umount_usage);
}
+#ifdef BB_FEATURE_CLEAN_UP
+ atexit(mtab_free);
+#endif
/* Parse any options */
while (--argc > 0 && **(++argv) == '-') {
umountAll = TRUE;
break;
#if defined BB_FEATURE_MOUNT_LOOP
- case 'f':
+ case 'l':
freeLoop = FALSE;
break;
#endif
useMtab = FALSE;
break;
#endif
-#ifdef BB_FEATURE_REMOUNT
+#ifdef BB_FEATURE_MOUNT_FORCE
+ case 'f':
+ doForce = TRUE;
+ break;
+#endif
case 'r':
doRemount = TRUE;
break;
-#endif
+ case 'v':
+ break; /* ignore -v */
default:
usage(umount_usage);
}
mtab_read();
if (umountAll == TRUE) {
- exit(umount_all(useMtab));
- }
- if (do_umount(*argv, useMtab) == 0)
- exit(TRUE);
- else {
- perror("umount");
- exit(FALSE);
+ if (umount_all(useMtab) == TRUE)
+ return EXIT_SUCCESS;
+ else
+ return EXIT_FAILURE;
}
+ if (do_umount(*argv, useMtab) == TRUE)
+ return EXIT_SUCCESS;
+ perror_msg_and_die("%s", *argv);
}