diff options
| author | phk <phk@FreeBSD.org> | 1999-10-09 11:54:14 +0000 |
|---|---|---|
| committer | phk <phk@FreeBSD.org> | 1999-10-09 11:54:14 +0000 |
| commit | 41c4f3920e76ddd3b3a183fc18e6e0834a26086b (patch) | |
| tree | 90d36f2866e2e9c8c9fe890230d8240ed54253f1 /sbin/mount_unionfs | |
| parent | 977cb3153eec3286210df53421e8494748c21d3a (diff) | |
| download | FreeBSD-src-41c4f3920e76ddd3b3a183fc18e6e0834a26086b.zip FreeBSD-src-41c4f3920e76ddd3b3a183fc18e6e0834a26086b.tar.gz | |
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
Diffstat (limited to 'sbin/mount_unionfs')
| -rw-r--r-- | sbin/mount_unionfs/mount_unionfs.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/sbin/mount_unionfs/mount_unionfs.c b/sbin/mount_unionfs/mount_unionfs.c index 4222ede..1d5d3eb 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", |
