Commit Vladimir's simplify_path.

1 files changed, 4 insertions, 7 deletions

diff --git a/util-linux/mount.c b/util-linux/mount.c
index eb6091f30..6ffce2bf1 100644
--- a/util-linux/mount.c
+++ b/util-linux/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");