aboutsummaryrefslogtreecommitdiff
path: root/sbin/mount_udf
diff options
context:
space:
mode:
authorJaakko Heinonen <jh@FreeBSD.org>2012-01-16 19:34:21 +0000
committerJaakko Heinonen <jh@FreeBSD.org>2012-01-16 19:34:21 +0000
commitd3250014386b2eae2bf27edcde24d97f7bbfcfc5 (patch)
tree54d0a2f2ed01c217587bf7b24aec11a7fbcadd97 /sbin/mount_udf
parent03c142e76290016711675793c65fe924a3d1b779 (diff)
downloadsrc-d3250014386b2eae2bf27edcde24d97f7bbfcfc5.tar.gz
src-d3250014386b2eae2bf27edcde24d97f7bbfcfc5.zip
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)
Notes
Notes: svn path=/head/; revision=230226
Diffstat (limited to 'sbin/mount_udf')
-rw-r--r--sbin/mount_udf/mount_udf.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/sbin/mount_udf/mount_udf.c b/sbin/mount_udf/mount_udf.c
index 033db70b9e6f..8ee1286eea33 100644
--- a/sbin/mount_udf/mount_udf.c
+++ b/sbin/mount_udf/mount_udf.c
@@ -111,7 +111,8 @@ main(int argc, char **argv)
* Resolve the mountpoint with realpath(3) and remove unnecessary
* slashes from the devicename if there are any.
*/
- (void)checkpath(dir, mntpath);
+ if (checkpath(dir, mntpath) != 0)
+ err(EX_USAGE, "%s", mntpath);
(void)rmslashes(dev, dev);
/*