From a7cecbc9170eed93d365c0c38e8ba1477ab0a40c Mon Sep 17 00:00:00 2001 From: Matt Kraai Date: Fri, 10 Aug 2001 15:05:27 +0000 Subject: Commit Vladimir's simplify_path. --- mount.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'mount.c') diff --git a/mount.c b/mount.c index eb6091f30..6ffce2bf1 100644 --- a/mount.c +++ b/mount.c @@ -395,18 +395,15 @@ extern int mount_main(int argc, char **argv) if (optind < argc) { /* if device is a filename get its real path */ if (stat(argv[optind], &statbuf) == 0) { - realpath(argv[optind], device); + device = simplify_path(argv[optind]); } else { safe_strncpy(device, argv[optind], PATH_MAX); } } - if (optind + 1 < argc) { - if (realpath(argv[optind + 1], directory) == NULL) { - perror_msg_and_die("%s", directory); - } - } - + if (optind + 1 < argc) + directory = simplify_path(argv[optind + 1]); + if (all == TRUE || optind + 1 == argc) { struct mntent *m = NULL; FILE *f = setmntent("/etc/fstab", "r"); -- cgit v1.2.3