aboutsummaryrefslogtreecommitdiff
path: root/sbin/mount_unionfs/mount_unionfs.c
diff options
context:
space:
mode:
authorPoul-Henning Kamp <phk@FreeBSD.org>1999-10-09 11:54:14 +0000
committerPoul-Henning Kamp <phk@FreeBSD.org>1999-10-09 11:54:14 +0000
commit73dd3167345391095dd7c75aefa870a5bce92397 (patch)
tree33cadf04c808cb0644aedaa306f8f3c0987ba3fe /sbin/mount_unionfs/mount_unionfs.c
parent1d64c295bbdb773ca3d62cdb5a9eec06e12799c8 (diff)
downloadsrc-73dd3167345391095dd7c75aefa870a5bce92397.tar.gz
src-73dd3167345391095dd7c75aefa870a5bce92397.zip
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
Notes
Notes: svn path=/head/; revision=52055
Diffstat (limited to 'sbin/mount_unionfs/mount_unionfs.c')
-rw-r--r--sbin/mount_unionfs/mount_unionfs.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/sbin/mount_unionfs/mount_unionfs.c b/sbin/mount_unionfs/mount_unionfs.c
index 4222ede4baad..1d5d3ebc504c 100644
--- a/sbin/mount_unionfs/mount_unionfs.c
+++ b/sbin/mount_unionfs/mount_unionfs.c
@@ -109,11 +109,9 @@ main(argc, argv)
if (argc != 2)
usage();
- if (realpath(argv[0], target) == 0)
- err(EX_OSERR, "%s", target);
-
- if (realpath(argv[1], source) == 0)
- err(EX_OSERR, "%s", source);
+ /* resolve both target and source with realpath(3) */
+ (void)checkpath(argv[0], target);
+ (void)checkpath(argv[1], source);
if (subdir(target, source) || subdir(source, target))
errx(EX_USAGE, "%s (%s) and %s (%s) are not distinct paths",