More shell features.... if-then-else-fi is now basically usable (disable

[oweals/busybox.git] / umount.c

diff --git a/umount.c b/umount.c
index ad7de2d20eb13f59f35a2b7a3c424e2962abc449..6a5e4cad8bc70c5caf0af91ef7e6b251ee3c3dbc 100644 (file)
--- a/umount.c
+++ b/umount.c
@@ -24,24 +24,20 @@
 
 #include "internal.h"
 #include <stdio.h>
-#include <sys/mount.h>
 #include <mntent.h>
 #include <errno.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
-       "\t-r:\tTry to remount devices as read-only if mount is busy\n"
-#if defined BB_FEATURE_MOUNT_LOOP
-       "\t-f:\tDo not free loop device (if a loop device has been used)\n"
-#endif
-;
+#define MNT_FORCE              1
+#define MS_MGC_VAL             0xc0ed0000 /* Magic number indicatng "new" flags */
+#define MS_REMOUNT             32      /* Alter flags of a mounted FS.  */
+#define 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;
@@ -53,6 +49,9 @@ static struct _mtab_entry_t *mtab_cache = NULL;
 
 
 
+#if defined BB_FEATURE_MOUNT_FORCE
+static int doForce = FALSE;
+#endif
 #if defined BB_FEATURE_MOUNT_LOOP
 static int freeLoop = TRUE;
 #endif
@@ -80,7 +79,7 @@ void mtab_read(void)
                return;
 
        if ((fp = setmntent(mtab_file, "r")) == NULL) {
-               fprintf(stderr, "Cannot open %s\n", mtab_file);
+               errorMsg("Cannot open %s\n", mtab_file);
                return;
        }
        while ((e = getmntent(fp))) {
@@ -143,7 +142,7 @@ char *mtab_next(void **iter)
 
 /* Don't bother to clean up, since exit() does that 
  * automagically, so we can save a few bytes */
-#if 0
+#ifdef BB_FEATURE_CLEAN_UP
 void mtab_free(void)
 {
        struct _mtab_entry_t *this, *next;
@@ -175,17 +174,22 @@ static int do_umount(const char *name, int useMtab)
        if (freeLoop == TRUE && blockDevice != NULL && !strncmp("/dev/loop", blockDevice, 9))
                /* this was a loop device, delete it */
                del_loop(blockDevice);
+#endif
+#if defined BB_FEATURE_MOUNT_FORCE
+       if (status != 0 && doForce == TRUE) {
+               status = umount2(blockDevice, MNT_FORCE);
+               if (status != 0) {
+                       fatalError("forced umount of %s failed!\n", 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 */
+                       errorMsg("%s busy - remounted read-only\n", blockDevice);
                } else {
-                       fprintf(stderr, "umount: Cannot remount %s read-only\n",
-                                       blockDevice);
+                       errorMsg("Cannot remount %s read-only\n", blockDevice);
                }
        }
        if (status == 0) {
@@ -231,6 +235,9 @@ extern int umount_main(int argc, char **argv)
        if (argc < 2) {
                usage(umount_usage);
        }
+#ifdef BB_FEATURE_CLEAN_UP
+       atexit(mtab_free);
+#endif
 
        /* Parse any options */
        while (--argc > 0 && **(++argv) == '-') {
@@ -240,7 +247,7 @@ extern int umount_main(int argc, char **argv)
                                umountAll = TRUE;
                                break;
 #if defined BB_FEATURE_MOUNT_LOOP
-                       case 'f':
+                       case 'l':
                                freeLoop = FALSE;
                                break;
 #endif
@@ -248,6 +255,11 @@ extern int umount_main(int argc, char **argv)
                        case 'n':
                                useMtab = FALSE;
                                break;
+#endif
+#ifdef BB_FEATURE_MOUNT_FORCE
+                       case 'f':
+                               doForce = TRUE;
+                               break;
 #endif
                        case 'r':
                                doRemount = TRUE;
@@ -265,9 +277,7 @@ extern int umount_main(int argc, char **argv)
        }
        if (do_umount(*argv, useMtab) == 0)
                exit(TRUE);
-       else {
-               perror("umount");
-               exit(FALSE);
-       }
+       perror("umount");
+       return(FALSE);
 }