From edb836f226a3e9d500cba400695648b0a3ee6585 Mon Sep 17 00:00:00 2001 From: Ingo Schwarze Date: Sat, 26 Nov 2011 22:38:11 +0000 Subject: Sync to OpenBSD, mostly gratuitous and whitespace differences, but a few serious things as well: * -M overrides MANPATH * -m prepends to the path * put back database close calls that got lost in mandocdb * missing sys/types.h in manpath.c, needed for size_t ok kristaps@ --- apropos.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'apropos.c') diff --git a/apropos.c b/apropos.c index 2324ab65..8ba45765 100644 --- a/apropos.c +++ b/apropos.c @@ -20,7 +20,6 @@ #endif #include -#include #include #include #include @@ -61,7 +60,7 @@ main(int argc, char *argv[]) e = NULL; rc = 0; - while (-1 != (ch = getopt(argc, argv, "M:m:S:s:"))) + while (-1 != (ch = getopt(argc, argv, "M:m:S:s:"))) switch (ch) { case ('M'): defpaths = optarg; @@ -96,10 +95,10 @@ main(int argc, char *argv[]) } rc = apropos_search - (paths.sz, paths.paths, + (paths.sz, paths.paths, &opts, e, terms, NULL, list); - if (0 == rc) + if (0 == rc) fprintf(stderr, "%s: Error reading " "manual database\n", progname); @@ -119,8 +118,8 @@ list(struct res *res, size_t sz, void *arg) qsort(res, sz, sizeof(struct res), cmp); for (i = 0; i < (int)sz; i++) - printf("%s(%s%s%s) - %s\n", res[i].title, - res[i].cat, + printf("%s(%s%s%s) - %s\n", res[i].title, + res[i].cat, *res[i].arch ? "/" : "", *res[i].arch ? res[i].arch : "", res[i].desc); @@ -139,9 +138,10 @@ usage(void) { fprintf(stderr, "usage: %s " - "[-M dirs] " - "[-m dirs] " + "[-M path] " + "[-m path] " "[-S arch] " "[-s section] " - "expression...\n", progname); + "expression...\n", + progname); } -- cgit