From a1018d4b412e9aa03fb18ff79885199f171b2220 Mon Sep 17 00:00:00 2001 From: Kristaps Dzonsons Date: Sat, 9 Jun 2012 14:11:15 +0000 Subject: Merge whatis.1 into apropos.1 (and remove), add whatis bits to apropos (via mansearch), and merge mandocdb.h into mansearch.h (and remove). --- apropos.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) (limited to 'apropos.c') diff --git a/apropos.c b/apropos.c index 469bff5e..1f8c219f 100644 --- a/apropos.c +++ b/apropos.c @@ -1,4 +1,4 @@ -/* $Id: apropos.c,v 1.31 2012/06/08 10:44:52 kristaps Exp $ */ +/* $Id: apropos.c,v 1.32 2012/06/09 14:11:15 kristaps Exp $ */ /* * Copyright (c) 2012 Kristaps Dzonsons * @@ -32,11 +32,11 @@ int main(int argc, char *argv[]) { - int ch; + int ch, whatis; + struct mansearch search; size_t i, sz; struct manpage *res; - char *conf_file, *defpaths, *auxpaths, - *arch, *sec; + char *conf_file, *defpaths, *auxpaths; struct manpaths paths; char *progname; extern char *optarg; @@ -48,8 +48,10 @@ main(int argc, char *argv[]) else ++progname; - auxpaths = defpaths = conf_file = arch = sec = NULL; + auxpaths = defpaths = conf_file = NULL; memset(&paths, 0, sizeof(struct manpaths)); + memset(&search, 0, sizeof(struct mansearch)); + whatis = (0 == strcmp(progname, "whatis")); while (-1 != (ch = getopt(argc, argv, "C:M:m:S:s:"))) switch (ch) { @@ -63,10 +65,10 @@ main(int argc, char *argv[]) auxpaths = optarg; break; case ('S'): - arch = optarg; + search.arch = optarg; break; case ('s'): - sec = optarg; + search.sec = optarg; break; default: goto usage; @@ -78,8 +80,11 @@ main(int argc, char *argv[]) if (0 == argc) goto usage; + search.deftype = whatis ? TYPE_Nm : TYPE_Nm | TYPE_Nd; + search.flags = whatis ? MANSEARCH_WHATIS : 0; + manpath_parse(&paths, conf_file, defpaths, auxpaths); - ch = mansearch(&paths, arch, sec, argc, argv, &res, &sz); + ch = mansearch(&search, &paths, argc, argv, &res, &sz); manpath_free(&paths); if (0 == ch) -- cgit v1.2.3