diff options
| author | Matt Kraai | 2001-05-02 21:24:51 +0000 |
|---|---|---|
| committer | Matt Kraai | 2001-05-02 21:24:51 +0000 |
| commit | adcbc12d85b91929b73f3897bff7d1559aa39c51 (patch) | |
| tree | 71609bf6a64df11bf0456542e14ca426772d5ce5 | |
| parent | 3425111bb9925b9a00c34cbe95639a6e0bce58c1 (diff) | |
| download | busybox-adcbc12d85b91929b73f3897bff7d1559aa39c51.zip busybox-adcbc12d85b91929b73f3897bff7d1559aa39c51.tar.gz | |
Canonicalize path before trying to unmount it.
| -rw-r--r-- | umount.c | 7 | ||||
| -rw-r--r-- | util-linux/umount.c | 7 |
2 files changed, 12 insertions, 2 deletions
@@ -22,6 +22,7 @@ * */ +#include <limits.h> #include <stdio.h> #include <mntent.h> #include <errno.h> @@ -236,6 +237,8 @@ static int umount_all(void) extern int umount_main(int argc, char **argv) { + char path[PATH_MAX]; + if (argc < 2) { show_usage(); } @@ -282,7 +285,9 @@ extern int umount_main(int argc, char **argv) else return EXIT_FAILURE; } - if (do_umount(*argv) == 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); } diff --git a/util-linux/umount.c b/util-linux/umount.c index 3e23b97..0eade5a 100644 --- a/util-linux/umount.c +++ b/util-linux/umount.c @@ -22,6 +22,7 @@ * */ +#include <limits.h> #include <stdio.h> #include <mntent.h> #include <errno.h> @@ -236,6 +237,8 @@ static int umount_all(void) extern int umount_main(int argc, char **argv) { + char path[PATH_MAX]; + if (argc < 2) { show_usage(); } @@ -282,7 +285,9 @@ extern int umount_main(int argc, char **argv) else return EXIT_FAILURE; } - if (do_umount(*argv) == 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); } |