diff options
| author | jh <jh@FreeBSD.org> | 2012-01-16 19:34:21 +0000 |
|---|---|---|
| committer | jh <jh@FreeBSD.org> | 2012-01-16 19:34:21 +0000 |
| commit | ae73284c1a1116d89c84235929df10421a348b30 (patch) | |
| tree | 54d0a2f2ed01c217587bf7b24aec11a7fbcadd97 /sbin/mount_nullfs | |
| parent | 5a45f730a5625608124e818a7be2c3dbd2d20512 (diff) | |
| download | FreeBSD-src-ae73284c1a1116d89c84235929df10421a348b30.zip FreeBSD-src-ae73284c1a1116d89c84235929df10421a348b30.tar.gz | |
Change checkpath() to not exit on error. This is a prerequisite for
fixing the mount(8) "failok" option.
PR: 163668
Reviewed by: Garrett Cooper, delphij (previous version)
Diffstat (limited to 'sbin/mount_nullfs')
| -rw-r--r-- | sbin/mount_nullfs/mount_nullfs.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sbin/mount_nullfs/mount_nullfs.c b/sbin/mount_nullfs/mount_nullfs.c index 4f84954..c88db3d 100644 --- a/sbin/mount_nullfs/mount_nullfs.c +++ b/sbin/mount_nullfs/mount_nullfs.c @@ -90,8 +90,10 @@ main(int argc, char *argv[]) usage(); /* resolve target and source with realpath(3) */ - (void)checkpath(argv[0], target); - (void)checkpath(argv[1], source); + if (checkpath(argv[0], target) != 0) + err(EX_USAGE, "%s", target); + if (checkpath(argv[1], source) != 0) + err(EX_USAGE, "%s", source); if (subdir(target, source) || subdir(source, target)) errx(EX_USAGE, "%s (%s) and %s are not distinct paths", |
