diff options
| author | Edward Tomasz Napierala <trasz@FreeBSD.org> | 2015-08-08 10:38:37 +0000 |
|---|---|---|
| committer | Edward Tomasz Napierala <trasz@FreeBSD.org> | 2015-08-08 10:38:37 +0000 |
| commit | 840a09d240affbc18b26d34461bb109d272d0d33 (patch) | |
| tree | 94422ccb5e717ed16bafb8dd1514449d0ff38a22 /usr.bin/units | |
| parent | 445bda3f4f94cca4ff138ac04203aa0420be9126 (diff) | |
| download | src-840a09d240affbc18b26d34461bb109d272d0d33.tar.gz src-840a09d240affbc18b26d34461bb109d272d0d33.zip | |
Fix interaction between libedit initialization and Capsicum
in units(1). The most visible is the removal of libedit warnings
about being unable to open termcap database.
Reviewed by: eadler@
MFC after: 1 month
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D3322
Notes
Notes:
svn path=/head/; revision=286446
Diffstat (limited to 'usr.bin/units')
| -rw-r--r-- | usr.bin/units/units.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/usr.bin/units/units.c b/usr.bin/units/units.c index 929510f5663f..94495c985cb6 100644 --- a/usr.bin/units/units.c +++ b/usr.bin/units/units.c @@ -802,10 +802,10 @@ main(int argc, char **argv) if (!readfile) readunits(NULL); - if (cap_enter() < 0 && errno != ENOSYS) - err(1, "unable to enter capability mode"); - if (optind == argc - 2) { + if (cap_enter() < 0 && errno != ENOSYS) + err(1, "unable to enter capability mode"); + havestr = argv[optind]; wantstr = argv[optind + 1]; initializeunit(&have); @@ -815,8 +815,7 @@ main(int argc, char **argv) addunit(&want, wantstr, 0, 1); completereduce(&want); showanswer(&have, &want); - } - else { + } else { inhistory = history_init(); el = el_init(argv[0], stdin, stdout, stderr); el_set(el, EL_PROMPT, &prompt); @@ -828,6 +827,9 @@ main(int argc, char **argv) if (inhistory == 0) err(1, "Could not initialize history"); + if (cap_enter() < 0 && errno != ENOSYS) + err(1, "unable to enter capability mode"); + if (!quiet) printf("%d units, %d prefixes\n", unitcount, prefixcount); |