summaryrefslogtreecommitdiffstats
path: root/apropos.c
diff options
context:
space:
mode:
authorIngo Schwarze <schwarze@openbsd.org>2013-12-31 03:41:14 +0000
committerIngo Schwarze <schwarze@openbsd.org>2013-12-31 03:41:14 +0000
commit7d7fb9a6710e1994bc796e3f32856c9449f32ebd (patch)
treea8c80d00ed63127827eb1656b37e9d22b77a63f1 /apropos.c
parent9858fa1eb5ffd1b8d151270ed7dafe03efa48365 (diff)
downloadmandoc-7d7fb9a6710e1994bc796e3f32856c9449f32ebd.tar.gz
Experimental feature to let apropos(1) show different keys than .Nd.
This really takes us beyond what grep -R /usr/*/man/ can do because now you can search for pages by *one* criterion and then display the contents of *another* macro from those pages, like in $ apropos -O Ox Fa~wchar to get an impression how long wide character handling is available.
Diffstat (limited to 'apropos.c')
-rw-r--r--apropos.c16
1 files changed, 13 insertions, 3 deletions
diff --git a/apropos.c b/apropos.c
index 52090f56..53db8425 100644
--- a/apropos.c
+++ b/apropos.c
@@ -1,6 +1,7 @@
/* $Id$ */
/*
* Copyright (c) 2012 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2013 Ingo Schwarze <schwarze@openbsd.org>
*
* Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
@@ -41,6 +42,7 @@ main(int argc, char *argv[])
char *defpaths, *auxpaths;
char *conf_file;
char *progname;
+ char *outkey;
extern char *optarg;
extern int optind;
@@ -57,8 +59,9 @@ main(int argc, char *argv[])
auxpaths = defpaths = NULL;
conf_file = NULL;
+ outkey = NULL;
- while (-1 != (ch = getopt(argc, argv, "C:M:m:S:s:")))
+ while (-1 != (ch = getopt(argc, argv, "C:M:m:O:S:s:")))
switch (ch) {
case ('C'):
conf_file = optarg;
@@ -69,6 +72,9 @@ main(int argc, char *argv[])
case ('m'):
auxpaths = optarg;
break;
+ case ('O'):
+ outkey = optarg;
+ break;
case ('S'):
search.arch = optarg;
break;
@@ -89,23 +95,27 @@ main(int argc, char *argv[])
search.flags = whatis ? MANSEARCH_WHATIS : 0;
manpath_parse(&paths, conf_file, defpaths, auxpaths);
- ch = mansearch(&search, &paths, argc, argv, &res, &sz);
+ ch = mansearch(&search, &paths, argc, argv, outkey, &res, &sz);
manpath_free(&paths);
if (0 == ch)
goto usage;
for (i = 0; i < sz; i++) {
- printf("%s - %s\n", res[i].names, res[i].desc);
+ printf("%s - %s\n", res[i].names,
+ NULL == outkey ? res[i].desc :
+ NULL == res[i].output ? "" : res[i].output);
free(res[i].file);
free(res[i].names);
free(res[i].desc);
+ free(res[i].output);
}
free(res);
return(sz ? EXIT_SUCCESS : EXIT_FAILURE);
usage:
fprintf(stderr, "usage: %s [-C file] [-M path] [-m path] "
+ "[-O outkey] "
"[-S arch] [-s section]%s ...\n", progname,
whatis ? " name" : "\n expression");
return(EXIT_FAILURE);