=================================================================== RCS file: /cvs/mandoc/Attic/apropos.c,v retrieving revision 1.13 retrieving revision 1.28 diff -u -p -r1.13 -r1.28 --- mandoc/Attic/apropos.c 2011/11/14 10:07:06 1.13 +++ mandoc/Attic/apropos.c 2012/03/24 01:46:25 1.28 @@ -1,6 +1,7 @@ -/* $Id: apropos.c,v 1.13 2011/11/14 10:07:06 kristaps Exp $ */ +/* $Id: apropos.c,v 1.28 2012/03/24 01:46:25 kristaps 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 * purpose with or without fee is hereby granted, provided that the above @@ -17,19 +18,26 @@ #ifdef HAVE_CONFIG_H #include "config.h" #endif +#include #include #include -#include #include #include #include #include "apropos_db.h" #include "mandoc.h" +#include "manpath.h" +#define SINGLETON(_res, _sz) \ + ((_sz) && (_res)[0].matched && \ + (1 == (_sz) || 0 == (_res)[1].matched)) +#define EMPTYSET(_res, _sz) \ + ((0 == (_sz)) || 0 == (_res)[0].matched) + static int cmp(const void *, const void *); -static void list(struct rec *, size_t, void *); +static void list(struct res *, size_t, void *); static void usage(void); static char *progname; @@ -37,24 +45,50 @@ static char *progname; int main(int argc, char *argv[]) { - int ch; - size_t sz; - char *buf; + int ch, rc, whatis, usecat; + struct res *res; + struct manpaths paths; + const char *prog; + pid_t pid; + char path[PATH_MAX]; + int fds[2]; + size_t terms, ressz, sz; struct opts opts; struct expr *e; + char *defpaths, *auxpaths, *conf_file, *cp; 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:"))) + whatis = 0 == strncmp(progname, "whatis", 6); + + memset(&paths, 0, sizeof(struct manpaths)); + memset(&opts, 0, sizeof(struct opts)); + + usecat = 0; + ressz = 0; + res = NULL; + auxpaths = defpaths = NULL; + conf_file = NULL; + e = NULL; + path[0] = '\0'; + + 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'): + auxpaths = optarg; + break; case ('S'): opts.arch = optarg; break; @@ -72,66 +106,120 @@ main(int argc, char *argv[]) if (0 == argc) return(EXIT_SUCCESS); - /* - * Collapse expressions into a single string. - * First count up the contained strings, adding a space at the - * end of each (plus nil-terminator). Then merge. - */ + rc = 0; - for (sz = 0, ch = 0; ch < argc; ch++) - sz += strlen(argv[ch]) + 1; + manpath_parse(&paths, conf_file, defpaths, auxpaths); - buf = mandoc_malloc(++sz); - - for (*buf = '\0', ch = 0; ch < argc; ch++) { - strlcat(buf, argv[ch], sz); - strlcat(buf, " ", sz); + e = whatis ? termcomp(argc, argv, &terms) : + exprcomp(argc, argv, &terms); + + if (NULL == e) { + fprintf(stderr, "%s: Bad expression\n", progname); + goto out; } - buf[sz - 2] = '\0'; + rc = apropos_search + (paths.sz, paths.paths, &opts, + e, terms, NULL, &ressz, &res, list); - if (NULL == (e = exprcomp(buf))) { - fprintf(stderr, "Bad expression\n"); - free(buf); - return(EXIT_FAILURE); - } + terms = 1; - free(buf); + if (0 == rc) { + fprintf(stderr, "%s: Bad database\n", progname); + goto out; + } else if ( ! isatty(STDOUT_FILENO) || EMPTYSET(res, ressz)) + goto out; - /* - * Configure databases. - * The keyword database is a btree that allows for duplicate - * entries. - * The index database is a recno. - */ + if ( ! SINGLETON(res, ressz)) { + printf("Which manpage would you like [1]? "); + fflush(stdout); + if (NULL != (cp = fgetln(stdin, &sz)) && + sz > 1 && '\n' == cp[--sz]) { + if ((ch = atoi(cp)) <= 0) + goto out; + terms = (size_t)ch; + } + } - apropos_search(&opts, e, NULL, list); + if (--terms < ressz && res[terms].matched) { + strlcpy(path, res[terms].file, PATH_MAX); + usecat = RESTYPE_CAT == res[terms].type; + } +out: + manpath_free(&paths); + resfree(res, ressz); exprfree(e); - return(EXIT_SUCCESS); + + if ('\0' == path[0]) + return(rc ? EXIT_SUCCESS : EXIT_FAILURE); + + if (-1 == pipe(fds)) { + perror(NULL); + exit(EXIT_FAILURE); + } + + if (-1 == (pid = fork())) { + perror(NULL); + exit(EXIT_FAILURE); + } else if (pid > 0) { + dup2(fds[0], STDIN_FILENO); + close(fds[1]); + prog = NULL != getenv("MANPAGER") ? + getenv("MANPAGER") : + (NULL != getenv("PAGER") ? + getenv("PAGER") : "more"); + execlp(prog, prog, (char *)NULL); + perror(prog); + return(EXIT_FAILURE); + } + + dup2(fds[1], STDOUT_FILENO); + close(fds[0]); + prog = usecat ? "cat" : "mandoc"; + execlp(prog, prog, path, (char *)NULL); + perror(prog); + return(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; + size_t 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, - res[i].cat, - *res[i].arch ? "/" : "", - *res[i].arch ? res[i].arch : "", - res[i].desc); + if (EMPTYSET(res, sz) || SINGLETON(res, sz)) + return; + + if ( ! isatty(STDOUT_FILENO)) + for (i = 0; i < sz && res[i].matched; i++) + 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); + else + for (i = 0; i < sz && res[i].matched; i++) + printf("[%zu] %s(%s%s%s) - %.70s\n", i + 1, + 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) { + const struct res *r1 = p1; + const struct res *r2 = p2; - return(strcmp(((const struct rec *)p1)->title, - ((const struct rec *)p2)->title)); + if (0 == r1->matched) + return(1); + else if (0 == r2->matched) + return(1); + + return(strcasecmp(r1->title, r2->title)); } static void @@ -139,9 +227,11 @@ usage(void) { fprintf(stderr, "usage: %s " - "[-I] " + "[-C file] " + "[-M manpath] " + "[-m manpath] " "[-S arch] " "[-s section] " - "EXPR\n", + "expression ...\n", progname); }