=================================================================== RCS file: /cvs/mandoc/Attic/apropos.c,v retrieving revision 1.9 retrieving revision 1.15 diff -u -p -r1.9 -r1.15 --- mandoc/Attic/apropos.c 2011/11/09 10:53:48 1.9 +++ mandoc/Attic/apropos.c 2011/11/20 15:43:14 1.15 @@ -1,6 +1,7 @@ -/* $Id: apropos.c,v 1.9 2011/11/09 10:53:48 kristaps Exp $ */ +/* $Id: apropos.c,v 1.15 2011/11/20 15:43:14 kristaps Exp $ */ /* * Copyright (c) 2011 Kristaps Dzonsons + * Copyright (c) 2011 Ingo Schwarze * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -14,6 +15,10 @@ * 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 @@ -21,34 +26,21 @@ #include #include -#include "apropos.h" +#include "apropos_db.h" #include "mandoc.h" -struct type { - int mask; - const char *name; /* command-line type name */ +/* + * List of paths to be searched for manual databases. + */ +struct manpaths { + int sz; + char **paths; }; -static const struct type types[] = { - { TYPE_NAME, "name" }, - { TYPE_FUNCTION, "func" }, - { TYPE_UTILITY, "utility" }, - { TYPE_INCLUDES, "incl" }, - { TYPE_VARIABLE, "var" }, - { TYPE_STANDARD, "stand" }, - { TYPE_AUTHOR, "auth" }, - { TYPE_CONFIG, "conf" }, - { TYPE_DESC, "desc" }, - { TYPE_XREF, "xref" }, - { TYPE_PATH, "path" }, - { TYPE_ENV, "env" }, - { TYPE_ERR, "err" }, - { INT_MAX, "all" }, - { 0, NULL } -}; - static int cmp(const void *, const void *); -static void list(struct rec *, size_t, 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; @@ -56,86 +48,83 @@ static char *progname; int main(int argc, char *argv[]) { - int ch, i; - char *q, *v; + int i, ch, rc; + struct manpaths paths; + size_t terms; struct opts opts; + struct expr *e; extern int optind; extern char *optarg; - memset(&opts, 0, sizeof(struct opts)); - - q = NULL; - progname = strrchr(argv[0], '/'); if (progname == NULL) progname = argv[0]; else ++progname; - while (-1 != (ch = getopt(argc, argv, "S:s:It:"))) + memset(&paths, 0, sizeof(struct manpaths)); + memset(&opts, 0, sizeof(struct opts)); + + e = NULL; + rc = 0; + + while (-1 != (ch = getopt(argc, argv, "m:S:s:"))) switch (ch) { + case ('m'): + if ( ! manpath_parse(&paths, optarg)) + goto out; + break; case ('S'): opts.arch = optarg; break; case ('s'): opts.cat = optarg; break; - case ('I'): - opts.flags |= OPTS_INSENS; - break; - case ('t'): - while (NULL != (v = strsep(&optarg, ","))) { - if ('\0' == *v) - continue; - for (i = 0; types[i].mask; i++) { - if (strcmp(types[i].name, v)) - continue; - break; - } - if (0 == types[i].mask) - break; - opts.types |= types[i].mask; - } - if (NULL == v) - break; - - fprintf(stderr, "%s: Bad type\n", v); - return(EXIT_FAILURE); default: usage(); - return(EXIT_FAILURE); + goto out; } argc -= optind; argv += optind; - if (0 == argc || '\0' == **argv) { - usage(); - return(EXIT_SUCCESS); - } else - q = *argv; + if (0 == argc) { + rc = 1; + goto out; + } - if (0 == opts.types) - opts.types = TYPE_NAME | TYPE_DESC; + if (0 == paths.sz && ! manpath_add(&paths, ".")) + goto out; - /* - * Configure databases. - * The keyword database is a btree that allows for duplicate - * entries. - * The index database is a recno. - */ + if (NULL == (e = exprcomp(argc, argv, &terms))) { + /* FIXME: be more specific about this. */ + fprintf(stderr, "Bad expression\n"); + goto out; + } - apropos_search(&opts, q, NULL, list); - return(EXIT_SUCCESS); + rc = apropos_search + (paths.sz, paths.paths, + &opts, e, terms, NULL, list); + + /* FIXME: report an error based on ch. */ + +out: + for (i = 0; i < paths.sz; i++) + free(paths.paths[i]); + + free(paths.paths); + exprfree(e); + + return(rc ? EXIT_SUCCESS : EXIT_FAILURE); } /* ARGSUSED */ static void -list(struct rec *res, size_t sz, void *arg) +list(struct res *res, size_t sz, void *arg) { int i; - qsort(res, sz, sizeof(struct rec), cmp); + qsort(res, sz, sizeof(struct res), cmp); for (i = 0; i < (int)sz; i++) printf("%s(%s%s%s) - %s\n", res[i].title, @@ -149,8 +138,8 @@ static int cmp(const void *p1, const void *p2) { - return(strcmp(((const struct rec *)p1)->title, - ((const struct rec *)p2)->title)); + return(strcmp(((const struct res *)p1)->title, + ((const struct res *)p2)->title)); } static void @@ -158,9 +147,47 @@ usage(void) { fprintf(stderr, "usage: %s " - "[-I] " + "[-m dirs] " "[-S arch] " "[-s section] " - "[-t type[,...]] " - "key\n", progname); + "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); }