From ae73284c1a1116d89c84235929df10421a348b30 Mon Sep 17 00:00:00 2001 From: jh Date: Mon, 16 Jan 2012 19:34:21 +0000 Subject: 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) --- sbin/mount_msdosfs/mount_msdosfs.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'sbin/mount_msdosfs/mount_msdosfs.c') diff --git a/sbin/mount_msdosfs/mount_msdosfs.c b/sbin/mount_msdosfs/mount_msdosfs.c index 3ba67ea..3da673d 100644 --- a/sbin/mount_msdosfs/mount_msdosfs.c +++ b/sbin/mount_msdosfs/mount_msdosfs.c @@ -193,7 +193,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); if (!set_gid || !set_uid || !set_mask) { -- cgit v1.1