diff options
Diffstat (limited to 'usr.bin/mandoc/apropos.c')
| -rw-r--r-- | usr.bin/mandoc/apropos.c | 96 |
1 files changed, 26 insertions, 70 deletions
diff --git a/usr.bin/mandoc/apropos.c b/usr.bin/mandoc/apropos.c index 3b58c061e53..d9cf3d1659c 100644 --- a/usr.bin/mandoc/apropos.c +++ b/usr.bin/mandoc/apropos.c @@ -1,7 +1,6 @@ -/* $Id: apropos.c,v 1.17 2013/07/12 11:01:42 schwarze Exp $ */ +/* $Id: apropos.c,v 1.18 2013/12/31 00:40:19 schwarze Exp $ */ /* - * Copyright (c) 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv> - * Copyright (c) 2011 Ingo Schwarze <schwarze@openbsd.org> + * Copyright (c) 2012 Kristaps Dzonsons <kristaps@bsd.lv> * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -19,30 +18,26 @@ #include <assert.h> #include <getopt.h> +#include <stdint.h> #include <stdio.h> #include <stdlib.h> #include <string.h> +#include <unistd.h> -#include "apropos_db.h" -#include "mandoc.h" #include "manpath.h" - -static int cmp(const void *, const void *); -static void list(struct res *, size_t, void *); - -static char *progname; +#include "mansearch.h" int apropos(int argc, char *argv[]) { - int ch, rc, whatis; - struct res *res; + int ch, whatis; + struct mansearch search; + size_t i, sz; + struct manpage *res; struct manpaths paths; - size_t terms, ressz; - struct opts opts; - struct expr *e; char *defpaths, *auxpaths; char *conf_file; + char *progname; extern char *optarg; extern int optind; @@ -55,13 +50,10 @@ apropos(int argc, char *argv[]) whatis = (0 == strncmp(progname, "whatis", 6)); memset(&paths, 0, sizeof(struct manpaths)); - memset(&opts, 0, sizeof(struct opts)); + memset(&search, 0, sizeof(struct mansearch)); - ressz = 0; - res = NULL; auxpaths = defpaths = NULL; conf_file = NULL; - e = NULL; while (-1 != (ch = getopt(argc, argv, "C:M:m:S:s:"))) switch (ch) { @@ -75,10 +67,10 @@ apropos(int argc, char *argv[]) auxpaths = optarg; break; case ('S'): - opts.arch = optarg; + search.arch = optarg; break; case ('s'): - opts.cat = optarg; + search.sec = optarg; break; default: goto usage; @@ -90,64 +82,28 @@ apropos(int argc, char *argv[]) if (0 == argc) goto usage; - rc = 0; + search.deftype = whatis ? TYPE_Nm : TYPE_Nm | TYPE_Nd; + search.flags = whatis ? MANSEARCH_WHATIS : 0; manpath_parse(&paths, conf_file, defpaths, auxpaths); + ch = mansearch(&search, &paths, argc, argv, &res, &sz); + manpath_free(&paths); - e = whatis ? termcomp(argc, argv, &terms) : - exprcomp(argc, argv, &terms); - - if (NULL == e) { - fprintf(stderr, "%s: Bad expression\n", progname); - goto out; - } - - rc = apropos_search - (paths.sz, paths.paths, &opts, - e, terms, NULL, &ressz, &res, list); + if (0 == ch) + goto usage; - if (0 == rc) { - fprintf(stderr, "%s: Bad database\n", progname); - goto out; + for (i = 0; i < sz; i++) { + printf("%s - %s\n", res[i].names, res[i].desc); + free(res[i].file); + free(res[i].names); + free(res[i].desc); } -out: - manpath_free(&paths); - resfree(res, ressz); - exprfree(e); - return(rc ? EXIT_SUCCESS : EXIT_FAILURE); - + free(res); + return(sz ? EXIT_SUCCESS : EXIT_FAILURE); usage: fprintf(stderr, "usage: %s [-C file] [-M path] [-m path] " "[-S arch] [-s section]%s ...\n", progname, whatis ? " name" : "\n expression"); return(EXIT_FAILURE); } - -/* ARGSUSED */ -static void -list(struct res *res, size_t sz, void *arg) -{ - size_t i; - - qsort(res, sz, sizeof(struct res), cmp); - - for (i = 0; i < sz; i++) { - if ( ! res[i].matched) - continue; - printf("%s(%s%s%s) - %.70s\n", - res[i].title, - res[i].cat, - *res[i].arch ? "/" : "", - *res[i].arch ? res[i].arch : "", - res[i].desc); - } -} - -static int -cmp(const void *p1, const void *p2) -{ - - return(strcasecmp(((const struct res *)p1)->title, - ((const struct res *)p2)->title)); -} |