diff options
Diffstat (limited to 'apropos.c')
| -rw-r--r-- | apropos.c | 110 |
1 files changed, 90 insertions, 20 deletions
@@ -1,6 +1,7 @@ -/* $Id: apropos.c,v 1.14 2011/11/18 07:02:19 kristaps Exp $ */ +/* $Id: apropos.c,v 1.15 2011/11/20 15:43:14 kristaps Exp $ */ /* * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv> + * Copyright (c) 2011 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 @@ -28,8 +29,18 @@ #include "apropos_db.h" #include "mandoc.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; @@ -37,23 +48,32 @@ static char *progname; int main(int argc, char *argv[]) { - int ch; + 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)); - progname = strrchr(argv[0], '/'); if (progname == NULL) progname = argv[0]; else ++progname; - while (-1 != (ch = getopt(argc, argv, "S:s:"))) + 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; @@ -62,32 +82,40 @@ main(int argc, char *argv[]) break; default: usage(); - return(EXIT_FAILURE); + goto out; } argc -= optind; argv += optind; - if (0 == argc) - return(EXIT_SUCCESS); + if (0 == argc) { + rc = 1; + goto out; + } + + if (0 == paths.sz && ! manpath_add(&paths, ".")) + goto out; if (NULL == (e = exprcomp(argc, argv, &terms))) { + /* FIXME: be more specific about this. */ fprintf(stderr, "Bad expression\n"); - return(EXIT_FAILURE); + goto out; } - /* - * Configure databases. - * The keyword database is a btree that allows for duplicate - * entries. - * The index database is a recno. - */ + rc = apropos_search + (paths.sz, paths.paths, + &opts, e, terms, NULL, list); + + /* FIXME: report an error based on ch. */ - ch = apropos_search(&opts, e, terms, NULL, list); +out: + for (i = 0; i < paths.sz; i++) + free(paths.paths[i]); + + free(paths.paths); exprfree(e); - if (0 == ch) - fprintf(stderr, "%s: Database error\n", progname); - return(ch ? EXIT_SUCCESS : EXIT_FAILURE); + + return(rc ? EXIT_SUCCESS : EXIT_FAILURE); } /* ARGSUSED */ @@ -118,6 +146,48 @@ static void usage(void) { - fprintf(stderr, "usage: %s [-S arch] [-s section] " + 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); +} |