summaryrefslogtreecommitdiffstats
path: root/sbin/mount_msdosfs
diff options
context:
space:
mode:
authorjh <jh@FreeBSD.org>2012-01-16 19:34:21 +0000
committerjh <jh@FreeBSD.org>2012-01-16 19:34:21 +0000
commitae73284c1a1116d89c84235929df10421a348b30 (patch)
tree54d0a2f2ed01c217587bf7b24aec11a7fbcadd97 /sbin/mount_msdosfs
parent5a45f730a5625608124e818a7be2c3dbd2d20512 (diff)
downloadFreeBSD-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_msdosfs')
-rw-r--r--sbin/mount_msdosfs/mount_msdosfs.c3
1 files changed, 2 insertions, 1 deletions
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) {
OpenPOWER on IntegriCloud