mount* fixes from Martin Blapp <mb@imp.ch>:

        Made mount more userfriendly (bad slashes are now filtered out)
        and we remove in mount_nfs trailing slashes if there are any.

        Fixed mount_xxx binarys to resolve with realpath(3)
        the mountpoint.

        Translate the deprecated nfs-syntax with '@' to ':' .
        The ':' syntax has now precedence, but '@' still works.
        Notify the user that the '@' syntax should not be used.

PR: 7846
PR: 13692
Submitted by:   Martin Blapp <mb@imp.ch>
Reviewed by:    phk

1 files changed, 9 insertions, 2 deletions

diff --git a/sbin/mount_ext2fs/mount_ext2fs.c b/sbin/mount_ext2fs/mount_ext2fs.c
index 00a2024..ded0195 100644
--- a/sbin/mount_ext2fs/mount_ext2fs.c
+++ b/sbin/mount_ext2fs/mount_ext2fs.c
@@ -76,7 +76,7 @@ main(argc, argv)
 {
 	struct ufs_args args;
 	int ch, mntflags;
-	char *fs_name, *options;
+	char *fs_name, *options, mntpath[MAXPATHLEN];
 	struct vfsconf vfc;
 	int error;
 
@@ -100,6 +100,13 @@ main(argc, argv)
         args.fspec = argv[0];	/* the name of the device file */
 	fs_name = argv[1];	/* the mount point */
 
+	/*
+	 * Resolve the mountpoint with realpath(3) and remove unnecessary
+	 * slashes from the devicename if there are any.
+	 */
+	(void)checkpath(fs_name, mntpath);
+	(void)rmslashes(args.fspec, args.fspec);
+
 #define DEFAULT_ROOTUID	-2
 	args.export.ex_root = DEFAULT_ROOTUID;
 	if (mntflags & MNT_RDONLY)
@@ -118,7 +125,7 @@ main(argc, argv)
 	if (error)
 		errx(EX_OSERR, "ext2fs filesystem is not available");
 
-	if (mount(vfc.vfc_name, fs_name, mntflags, &args) < 0)
+	if (mount(vfc.vfc_name, mntpath, mntflags, &args) < 0)
 		err(EX_OSERR, "%s", args.fspec);
 	exit(0);
 }