diff options
| author | ngie <ngie@FreeBSD.org> | 2016-08-28 07:16:11 +0000 |
|---|---|---|
| committer | ngie <ngie@FreeBSD.org> | 2016-08-28 07:16:11 +0000 |
| commit | 7ed453b50bf8f97d17b8f91784c81fe63f981274 (patch) | |
| tree | 1aba175a04a119aeeea35a0ee73967010244897f | |
| parent | a0ee1f5e5263b159eaa8404042fd76246c3f2480 (diff) | |
| download | FreeBSD-src-7ed453b50bf8f97d17b8f91784c81fe63f981274.zip FreeBSD-src-7ed453b50bf8f97d17b8f91784c81fe63f981274.tar.gz | |
MFC r303830,r304693,r304694,r304698:
r303830:
Remove vestigal references to __alpha__
Replace alpha reference in getconf(1) with amd64 [*]
PR: 211300 [*]
r304693:
Clean up trailing whitespace
r304694:
Add `MIN_HOLE_SIZE` pathconf(2) support to getconf
This allows shell programs to programmatically determine whether
or not a filesystem supports sparse files
r304698:
Add support for _PC_ACL_NFS4 as TRUSTEDBSD_ACL_NFS4
The TRUSTEDBSD prefix was chosen for consistency with the other
related `_PC_ACL*` prefixed variables.
| -rw-r--r-- | usr.bin/getconf/getconf.c | 4 | ||||
| -rw-r--r-- | usr.bin/getconf/pathconf.gperf | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/usr.bin/getconf/getconf.c b/usr.bin/getconf/getconf.c index 5f88db6..a82196e 100644 --- a/usr.bin/getconf/getconf.c +++ b/usr.bin/getconf/getconf.c @@ -109,13 +109,13 @@ main(int argc, char **argv) do_confstr(name, key); else printf("undefined\n"); - } else { + } else { valid = find_sysconf(name, &key); if (valid > 0) { do_sysconf(name, key); } else if (valid < 0) { printf("undefined\n"); - } else + } else errx(EX_USAGE, "no such configuration parameter `%s'", name); diff --git a/usr.bin/getconf/pathconf.gperf b/usr.bin/getconf/pathconf.gperf index e8b8365..fd1a3a9 100644 --- a/usr.bin/getconf/pathconf.gperf +++ b/usr.bin/getconf/pathconf.gperf @@ -24,6 +24,7 @@ FILESIZEBITS, _PC_FILESIZEBITS LINK_MAX, _PC_LINK_MAX MAX_CANON, _PC_MAX_CANON MAX_INPUT, _PC_MAX_INPUT +MIN_HOLE_SIZE, _PC_MIN_HOLE_SIZE NAME_MAX, _PC_NAME_MAX PATH_MAX, _PC_PATH_MAX PIPE_BUF, _PC_PIPE_BUF @@ -34,6 +35,7 @@ POSIX_REC_MIN_XFER_SIZE, _PC_REC_MIN_XFER_SIZE POSIX_REC_XFER_ALIGN, _PC_REC_XFER_ALIGN SYMLINK_MAX, _PC_SYMLINK_MAX TRUSTEDBSD_ACL_EXTENDED, _PC_ACL_EXTENDED +TRUSTEDBSD_ACL_NFS4, _PC_ACL_NFS4 TRUSTEDBSD_ACL_PATH_MAX, _PC_ACL_PATH_MAX TRUSTEDBSD_CAP_PRESENT, _PC_CAP_PRESENT TRUSTEDBSD_INF_PRESENT, _PC_INF_PRESENT |
