=================================================================== RCS file: /cvs/mandoc/Attic/apropos.c,v retrieving revision 1.15 retrieving revision 1.27.2.2 diff -u -p -r1.15 -r1.27.2.2 --- mandoc/Attic/apropos.c 2011/11/20 15:43:14 1.15 +++ mandoc/Attic/apropos.c 2014/08/11 00:31:13 1.27.2.2 @@ -1,6 +1,6 @@ -/* $Id: apropos.c,v 1.15 2011/11/20 15:43:14 kristaps Exp $ */ +/* $Id: apropos.c,v 1.27.2.2 2014/08/11 00:31:13 schwarze Exp $ */ /* - * Copyright (c) 2011 Kristaps Dzonsons + * Copyright (c) 2011, 2012 Kristaps Dzonsons * Copyright (c) 2011 Ingo Schwarze * * Permission to use, copy, modify, and distribute this software for any @@ -15,46 +15,39 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif +#include +#include + #include #include -#include #include #include #include #include "apropos_db.h" #include "mandoc.h" +#include "manpath.h" -/* - * List of paths to be searched for manual databases. - */ -struct manpaths { - int sz; - char **paths; -}; - static int cmp(const void *, const void *); static void list(struct res *, size_t, void *); -static int manpath_add(struct manpaths *, const char *); -static int manpath_parse(struct manpaths *, char *); -static void usage(void); static char *progname; int main(int argc, char *argv[]) { - int i, ch, rc; + int ch, rc, whatis; + struct res *res; struct manpaths paths; - size_t terms; + size_t terms, ressz; struct opts opts; struct expr *e; - extern int optind; + char *defpaths, *auxpaths; + char *conf_file; extern char *optarg; + extern int optind; progname = strrchr(argv[0], '/'); if (progname == NULL) @@ -62,17 +55,27 @@ main(int argc, char *argv[]) else ++progname; + whatis = (0 == strncmp(progname, "whatis", 6)); + memset(&paths, 0, sizeof(struct manpaths)); memset(&opts, 0, sizeof(struct opts)); + ressz = 0; + res = NULL; + auxpaths = defpaths = NULL; + conf_file = NULL; e = NULL; - rc = 0; - while (-1 != (ch = getopt(argc, argv, "m:S:s:"))) + while (-1 != (ch = getopt(argc, argv, "C:M:m:S:s:"))) switch (ch) { + case ('C'): + conf_file = optarg; + break; + case ('M'): + defpaths = optarg; + break; case ('m'): - if ( ! manpath_parse(&paths, optarg)) - goto out; + auxpaths = optarg; break; case ('S'): opts.arch = optarg; @@ -81,113 +84,73 @@ main(int argc, char *argv[]) opts.cat = optarg; break; default: - usage(); - goto out; + goto usage; } argc -= optind; argv += optind; - if (0 == argc) { - rc = 1; - goto out; - } + if (0 == argc) + goto usage; - if (0 == paths.sz && ! manpath_add(&paths, ".")) - goto out; + rc = 0; - if (NULL == (e = exprcomp(argc, argv, &terms))) { - /* FIXME: be more specific about this. */ - fprintf(stderr, "Bad expression\n"); + manpath_parse(&paths, conf_file, defpaths, auxpaths); + + 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, list); + (paths.sz, paths.paths, &opts, + e, terms, NULL, &ressz, &res, list); - /* FIXME: report an error based on ch. */ + if (0 == rc) { + fprintf(stderr, "%s: Bad database\n", progname); + goto out; + } out: - for (i = 0; i < paths.sz; i++) - free(paths.paths[i]); - - free(paths.paths); + manpath_free(&paths); + resfree(res, ressz); exprfree(e); - return(rc ? 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) { - int i; + size_t i; 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, + 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(strcmp(((const struct res *)p1)->title, + return(strcasecmp(((const struct res *)p1)->title, ((const struct res *)p2)->title)); -} - -static void -usage(void) -{ - - fprintf(stderr, "usage: %s " - "[-m dirs] " - "[-S arch] " - "[-s section] " - "expression...\n", progname); -} - -/* - * Parse a FULL pathname from a colon-separated list of arrays. - */ -static int -manpath_parse(struct manpaths *dirs, char *path) -{ - char *dir; - - for (dir = strtok(path, ":"); dir; dir = strtok(NULL, ":")) - if ( ! manpath_add(dirs, dir)) - return(0); - - return(1); -} - -/* - * Add a directory to the array. - * Grow the array one-by-one for simplicity's sake. - * Return 0 if the directory is not a real path. - */ -static int -manpath_add(struct manpaths *dirs, const char *dir) -{ - char buf[PATH_MAX]; - char *cp; - - if (NULL == (cp = realpath(dir, buf))) { - fprintf(stderr, "%s: Invalid path\n", dir); - return(0); - } - - dirs->paths = mandoc_realloc - (dirs->paths, - ((size_t)dirs->sz + 1) * sizeof(char *)); - - dirs->paths[dirs->sz++] = mandoc_strdup(cp); - return(1); }