Add errno.h

[oweals/busybox.git] / umount.c

diff --git a/umount.c b/umount.c
index 18a5afe8014a9e71ffb7ec364f38de56636ab97f..2e2d95de449562333e230816848ea68ca8d0dee8 100644 (file)
--- a/umount.c
+++ b/umount.c
@@ -22,29 +22,22 @@
  *
  */
 
-#include "internal.h"
+#include "busybox.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_FORCE
-       "\t-f:\tForce filesystem umount (i.e. unreachable NFS server)\n"
-#endif
-#if defined BB_FEATURE_MOUNT_LOOP
-       "\t-l:\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;
@@ -86,7 +79,7 @@ void mtab_read(void)
                return;
 
        if ((fp = setmntent(mtab_file, "r")) == NULL) {
-               fprintf(stderr, "Cannot open %s\n", mtab_file);
+               error_msg("Cannot open %s\n", mtab_file);
                return;
        }
        while ((e = getmntent(fp))) {
@@ -149,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;
@@ -186,7 +179,7 @@ static int do_umount(const char *name, int useMtab)
        if (status != 0 && doForce == TRUE) {
                status = umount2(blockDevice, MNT_FORCE);
                if (status != 0) {
-                       fatalError("umount: forced umount of %s failed!\n", blockDevice);
+                       error_msg_and_die("forced umount of %s failed!\n", blockDevice);
                }
        }
 #endif
@@ -194,11 +187,9 @@ static int do_umount(const char *name, int useMtab)
                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);
+                       error_msg("%s busy - remounted read-only\n", blockDevice);
                } else {
-                       fprintf(stderr, "umount: Cannot remount %s read-only\n",
-                                       blockDevice);
+                       error_msg("Cannot remount %s read-only\n", blockDevice);
                }
        }
        if (status == 0) {
@@ -221,18 +212,18 @@ static int umount_all(int useMtab)
                /* 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;
                        }
                }
        }
@@ -244,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) == '-') {
@@ -279,13 +273,13 @@ extern int umount_main(int argc, char **argv)
 
        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);
 }