diff options
| author | Jaakko Heinonen <jh@FreeBSD.org> | 2012-01-20 07:29:29 +0000 |
|---|---|---|
| committer | Jaakko Heinonen <jh@FreeBSD.org> | 2012-01-20 07:29:29 +0000 |
| commit | b8f532c5b78512d5ca68382f3a322d28331c79aa (patch) | |
| tree | 1749c91468413e9e15f995b4e1f49e707be9e004 | |
| parent | 6e3ab4e1b3456aff906532ff79bec4631fcfa031 (diff) | |
| download | src-b8f532c5b78512d5ca68382f3a322d28331c79aa.tar.gz src-b8f532c5b78512d5ca68382f3a322d28331c79aa.zip | |
- Clean up checkpath().
- Remove unneeded sysexits.h include.
No functional change.
Submitted by: bde
Notes
Notes:
svn path=/head/; revision=230372
| -rw-r--r-- | sbin/mount/getmntopts.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/sbin/mount/getmntopts.c b/sbin/mount/getmntopts.c index 350306062632..f8a34530c5dc 100644 --- a/sbin/mount/getmntopts.c +++ b/sbin/mount/getmntopts.c @@ -46,7 +46,6 @@ __FBSDID("$FreeBSD$"); #include <stdio.h> #include <stdlib.h> #include <string.h> -#include <sysexits.h> #include "mntopts.h" @@ -129,14 +128,12 @@ checkpath(const char *path, char *resolved) { struct stat sb; - if (realpath(path, resolved) != NULL && stat(resolved, &sb) == 0) { - if (!S_ISDIR(sb.st_mode)) { - errno = ENOTDIR; - return (1); - } - } else + if (realpath(path, resolved) == NULL || stat(resolved, &sb) != 0) return (1); - + if (!S_ISDIR(sb.st_mode)) { + errno = ENOTDIR; + return (1); + } return (0); } |