Remove debugging statement.

[oweals/busybox.git] / umount.c

diff --git a/umount.c b/umount.c
index c160ec28481f7ac26f8aba78930bb4b5ca2e7123..8565744f256926a94e42ea4d45a806fb35560519 100644 (file)
--- a/umount.c
+++ b/umount.c
@@ -22,12 +22,13 @@
  *
  */
 
-#include "busybox.h"
+#include <limits.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;
@@ -57,7 +58,9 @@ static int doForce = FALSE;
 #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 */
@@ -71,7 +74,7 @@ extern const char mtab_file[];        /* Defined in utility.c */
  * TODO: Perhaps switch to using Glibc's getmntent_r
  *        -Erik
  */
-void mtab_read(void)
+static void mtab_read(void)
 {
        struct _mtab_entry_t *entry = NULL;
        struct mntent *e;
@@ -94,7 +97,7 @@ void mtab_read(void)
        endmntent(fp);
 }
 
-char *mtab_getinfo(const char *match, const char which)
+static char *mtab_getinfo(const char *match, const char which)
 {
        struct _mtab_entry_t *cur = mtab_cache;
 
@@ -104,12 +107,11 @@ char *mtab_getinfo(const char *match, const char which)
                        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 */
-                                       find_real_root_device_name( cur->device);
-                                       return ( cur->device);
+                                       cur->device = find_real_root_device_name(cur->device);
                                }
 #endif
                                return cur->device;
@@ -120,18 +122,7 @@ char *mtab_getinfo(const char *match, const char which)
        return NULL;
 }
 
-char *mtab_first(void **iter)
-{
-       struct _mtab_entry_t *mtab_iter;
-
-       if (!iter)
-               return NULL;
-       mtab_iter = mtab_cache;
-       *iter = (void *) mtab_iter;
-       return mtab_next(iter);
-}
-
-char *mtab_next(void **iter)
+static char *mtab_next(void **iter)
 {
        char *mp;
 
@@ -142,10 +133,21 @@ char *mtab_next(void **iter)
        return mp;
 }
 
+static char *mtab_first(void **iter)
+{
+       struct _mtab_entry_t *mtab_iter;
+
+       if (!iter)
+               return NULL;
+       mtab_iter = mtab_cache;
+       *iter = (void *) mtab_iter;
+       return mtab_next(iter);
+}
+
 /* 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)
+static void mtab_free(void)
 {
        struct _mtab_entry_t *this, *next;
 
@@ -162,7 +164,7 @@ void mtab_free(void)
 }
 #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);
@@ -195,7 +197,7 @@ static int do_umount(const char *name, int useMtab)
                }
        }
        if (status == 0) {
-#if defined BB_MTAB
+#if defined BB_FEATURE_MTAB_SUPPORT
                if (useMtab == TRUE)
                        erase_mtab(name);
 #endif
@@ -204,7 +206,7 @@ static int do_umount(const char *name, int useMtab)
        return (FALSE);
 }
 
-static int umount_all(int useMtab)
+static int umount_all(void)
 {
        int status = TRUE;
        char *mountpt;
@@ -214,14 +216,14 @@ static int umount_all(int useMtab)
                /* 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));
@@ -234,6 +236,8 @@ static int umount_all(int useMtab)
 
 extern int umount_main(int argc, char **argv)
 {
+       char path[PATH_MAX];
+
        if (argc < 2) {
                show_usage();
        }
@@ -253,7 +257,7 @@ extern int umount_main(int argc, char **argv)
                                freeLoop = FALSE;
                                break;
 #endif
-#ifdef BB_MTAB
+#ifdef BB_FEATURE_MTAB_SUPPORT
                        case 'n':
                                useMtab = FALSE;
                                break;
@@ -275,12 +279,14 @@ extern int umount_main(int argc, char **argv)
 
        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 (realpath(*argv, path) == NULL)
+               perror_msg_and_die("%s", path);
+       if (do_umount(path) == TRUE)
                return EXIT_SUCCESS;
        perror_msg_and_die("%s", *argv);
 }