diff options
author | Ingo Schwarze <schwarze@openbsd.org> | 2011-11-26 22:38:11 +0000 |
---|---|---|
committer | Ingo Schwarze <schwarze@openbsd.org> | 2011-11-26 22:38:11 +0000 |
commit | 8f00108b9e7335a68e0dfa8b30abc8679c8c6a0a (patch) | |
tree | 07c306d3b0ee1bfc35064b2d154ab4a76df54392 /apropos.c | |
parent | 84a5530bc611551b040bc50e3aebcce2b63255ee (diff) | |
download | mandoc-8f00108b9e7335a68e0dfa8b30abc8679c8c6a0a.tar.gz mandoc-8f00108b9e7335a68e0dfa8b30abc8679c8c6a0a.tar.zst mandoc-8f00108b9e7335a68e0dfa8b30abc8679c8c6a0a.zip |
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@
Diffstat (limited to 'apropos.c')
-rw-r--r-- | apropos.c | 20 |
1 files changed, 10 insertions, 10 deletions
@@ -1,4 +1,4 @@ -/* $Id: apropos.c,v 1.18 2011/11/23 09:50:40 kristaps Exp $ */ +/* $Id: apropos.c,v 1.19 2011/11/26 22:38:11 schwarze Exp $ */ /* * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2011 Ingo Schwarze <schwarze@openbsd.org> @@ -20,7 +20,6 @@ #endif #include <assert.h> -#include <ctype.h> #include <getopt.h> #include <stdio.h> #include <stdlib.h> @@ -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); } |