=================================================================== RCS file: /cvs/mandoc/Attic/apropos.c,v retrieving revision 1.17 retrieving revision 1.27 diff -u -p -r1.17 -r1.27 --- mandoc/Attic/apropos.c 2011/11/20 21:36:00 1.17 +++ mandoc/Attic/apropos.c 2012/03/24 00:31:55 1.27 @@ -1,4 +1,4 @@ -/* $Id: apropos.c,v 1.17 2011/11/20 21:36:00 kristaps Exp $ */ +/* $Id: apropos.c,v 1.27 2012/03/24 00:31:55 kristaps Exp $ */ /* * Copyright (c) 2011 Kristaps Dzonsons * Copyright (c) 2011 Ingo Schwarze @@ -18,38 +18,20 @@ #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" -/* - * FIXME: add support for manpath(1), which everybody but OpenBSD and - * NetBSD seem to use. - */ -#define MAN_CONF_FILE "/etc/man.conf" -#define MAN_CONF_KEY "_whatdb" - -/* - * 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 void manpath_add(struct manpaths *, const char *); -static void manpath_parse(struct manpaths *, char *); -static void manpath_parseconf(struct manpaths *); static void usage(void); static char *progname; @@ -57,12 +39,14 @@ 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; char *defpaths, *auxpaths; + char *conf_file; extern int optind; extern char *optarg; @@ -72,15 +56,22 @@ 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: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; @@ -95,47 +86,39 @@ main(int argc, char *argv[]) break; default: usage(); - goto out; + return(EXIT_FAILURE); } argc -= optind; argv += optind; - if (0 == argc) { - rc = 1; - goto out; - } + if (0 == argc) + return(EXIT_SUCCESS); - if (NULL != getenv("MANPATH")) - defpaths = getenv("MANPATH"); + rc = 0; - if (NULL == defpaths) - manpath_parseconf(&paths); - else - manpath_parse(&paths, defpaths); + manpath_parse(&paths, conf_file, defpaths, auxpaths); - manpath_parse(&paths, auxpaths); - - if (NULL == (e = exprcomp(argc, argv, &terms))) { + 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); - if (0 == rc) - fprintf(stderr, "%s: Error reading " - "manual database\n", progname); - + 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); } @@ -143,23 +126,27 @@ out: 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)); } @@ -168,109 +155,11 @@ usage(void) { fprintf(stderr, "usage: %s " - "[-M dirs] " - "[-m dirs] " + "[-C file] " + "[-M manpath] " + "[-m manpath] " "[-S arch] " "[-s section] " - "expression...\n", progname); -} - -/* - * Parse a FULL pathname from a colon-separated list of arrays. - */ -static void -manpath_parse(struct manpaths *dirs, char *path) -{ - char *dir; - - if (NULL == path) - return; - - for (dir = strtok(path, ":"); dir; dir = strtok(NULL, ":")) - manpath_add(dirs, dir); -} - -/* - * Add a directory to the array, ignoring bad directories. - * Grow the array one-by-one for simplicity's sake. - */ -static void -manpath_add(struct manpaths *dirs, const char *dir) -{ - char buf[PATH_MAX]; - char *cp; - int i; - - if (NULL == (cp = realpath(dir, buf))) - return; - - for (i = 0; i < dirs->sz; i++) - if (0 == strcmp(dirs->paths[i], dir)) - return; - - dirs->paths = mandoc_realloc - (dirs->paths, - ((size_t)dirs->sz + 1) * sizeof(char *)); - - dirs->paths[dirs->sz++] = mandoc_strdup(cp); -} - -static void -manpath_parseconf(struct manpaths *dirs) -{ - FILE *stream; -#ifdef USE_MANPATH - char *buf; - size_t sz, bsz; - - stream = popen("manpath", "r"); - if (NULL == stream) - return; - - buf = NULL; - bsz = 0; - - do { - buf = mandoc_realloc(buf, bsz + 1024); - sz = fread(buf + (int)bsz, 1, 1024, stream); - bsz += sz; - } while (sz > 0); - - assert(bsz && '\n' == buf[bsz - 1]); - buf[bsz - 1] = '\0'; - - manpath_parse(dirs, buf); - free(buf); - pclose(stream); -#else - char *p, *q; - size_t len, keysz; - - keysz = strlen(MAN_CONF_KEY); - assert(keysz > 0); - - if (NULL == (stream = fopen(MAN_CONF_FILE, "r"))) - return; - - while (NULL != (p = fgetln(stream, &len))) { - if (0 == len || '\n' == p[--len]) - break; - p[len] = '\0'; - while (isspace((unsigned char)*p)) - p++; - if (strncmp(MAN_CONF_KEY, p, keysz)) - continue; - p += keysz; - while (isspace(*p)) - p++; - if ('\0' == *p) - continue; - if (NULL == (q = strrchr(p, '/'))) - continue; - *q = '\0'; - manpath_add(dirs, p); - } - - fclose(stream); -#endif + "expression ...\n", + progname); }