aboutsummaryrefslogtreecommitdiff
path: root/util-linux
diff options
context:
space:
mode:
authorkraai <kraai@69ca8d6d-28ef-0310-b511-8ec308f3f277>2001-05-02 21:24:51 +0000
committerkraai <kraai@69ca8d6d-28ef-0310-b511-8ec308f3f277>2001-05-02 21:24:51 +0000
commit58ce399556c73c06ab81f53b0c31e5d72f78f6b0 (patch)
tree71609bf6a64df11bf0456542e14ca426772d5ce5 /util-linux
parentbfc81e52aa374e304810cef71abadfd1533ad0ec (diff)
downloadbusybox-w32-58ce399556c73c06ab81f53b0c31e5d72f78f6b0.tar.gz
busybox-w32-58ce399556c73c06ab81f53b0c31e5d72f78f6b0.tar.bz2
busybox-w32-58ce399556c73c06ab81f53b0c31e5d72f78f6b0.zip
Canonicalize path before trying to unmount it.
git-svn-id: svn://busybox.net/trunk/busybox@2518 69ca8d6d-28ef-0310-b511-8ec308f3f277
Diffstat (limited to 'util-linux')
-rw-r--r--util-linux/umount.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/util-linux/umount.c b/util-linux/umount.c
index 3e23b9705..0eade5a36 100644
--- a/util-linux/umount.c
+++ b/util-linux/umount.c
@@ -22,6 +22,7 @@
22 * 22 *
23 */ 23 */
24 24
25#include <limits.h>
25#include <stdio.h> 26#include <stdio.h>
26#include <mntent.h> 27#include <mntent.h>
27#include <errno.h> 28#include <errno.h>
@@ -236,6 +237,8 @@ static int umount_all(void)
236 237
237extern int umount_main(int argc, char **argv) 238extern int umount_main(int argc, char **argv)
238{ 239{
240 char path[PATH_MAX];
241
239 if (argc < 2) { 242 if (argc < 2) {
240 show_usage(); 243 show_usage();
241 } 244 }
@@ -282,7 +285,9 @@ extern int umount_main(int argc, char **argv)
282 else 285 else
283 return EXIT_FAILURE; 286 return EXIT_FAILURE;
284 } 287 }
285 if (do_umount(*argv) == TRUE) 288 if (realpath(*argv, path) == NULL)
289 perror_msg_and_die("%s", path);
290 if (do_umount(path) == TRUE)
286 return EXIT_SUCCESS; 291 return EXIT_SUCCESS;
287 perror_msg_and_die("%s", *argv); 292 perror_msg_and_die("%s", *argv);
288} 293}