emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Canonicalize path before trying to unmount it.

Browse Source
This commit is contained in:
Matt Kraai 2001-05-02 21:24:51 +00:00
parent 3425111bb9
commit adcbc12d85
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
umount.c
View File

@ -22,6 +22,7 @@
* *
*/ */
#include <limits.h>
#include <stdio.h> #include <stdio.h>
#include <mntent.h> #include <mntent.h>
#include <errno.h> #include <errno.h>
@ -236,6 +237,8 @@ static int umount_all(void)
extern int umount_main(int argc, char **argv) extern int umount_main(int argc, char **argv)
{ {
char path[PATH_MAX];
if (argc < 2) { if (argc < 2) {
show_usage(); show_usage();
} }
@ -282,7 +285,9 @@ extern int umount_main(int argc, char **argv)
else else
return EXIT_FAILURE; 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; return EXIT_SUCCESS;
perror_msg_and_die("%s", *argv); perror_msg_and_die("%s", *argv);
} }

7
util-linux/umount.c
View File

@ -22,6 +22,7 @@
* *
*/ */
#include <limits.h>
#include <stdio.h> #include <stdio.h>
#include <mntent.h> #include <mntent.h>
#include <errno.h> #include <errno.h>
@ -236,6 +237,8 @@ static int umount_all(void)
extern int umount_main(int argc, char **argv) extern int umount_main(int argc, char **argv)
{ {
char path[PATH_MAX];
if (argc < 2) { if (argc < 2) {
show_usage(); show_usage();
} }
@ -282,7 +285,9 @@ extern int umount_main(int argc, char **argv)
else else
return EXIT_FAILURE; 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; return EXIT_SUCCESS;
perror_msg_and_die("%s", *argv); perror_msg_and_die("%s", *argv);
} }