=================================================================== RCS file: /cvs/mandoc/main.c,v retrieving revision 1.182 retrieving revision 1.188 diff -u -p -r1.182 -r1.188 --- mandoc/main.c 2014/08/21 00:32:15 1.182 +++ mandoc/main.c 2014/08/30 18:08:10 1.188 @@ -1,6 +1,6 @@ -/* $Id: main.c,v 1.182 2014/08/21 00:32:15 schwarze Exp $ */ +/* $Id: main.c,v 1.188 2014/08/30 18:08:10 schwarze Exp $ */ /* - * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons + * Copyright (c) 2008-2012 Kristaps Dzonsons * Copyright (c) 2010, 2011, 2012, 2014 Ingo Schwarze * Copyright (c) 2010 Joerg Sonnenberger * @@ -21,6 +21,9 @@ #include #include +#include +#include +#include #include #include #include @@ -84,6 +87,8 @@ static void mmsg(enum mandocerr, enum mandoclevel, const char *, int, int, const char *); static void parse(struct curparse *, int, const char *, enum mandoclevel *); +static enum mandoclevel passthrough(const char *); +static void spawn_pager(void); static int toptions(struct curparse *, char *); static void usage(enum argmode) __attribute__((noreturn)); static void version(void) __attribute__((noreturn)); @@ -102,8 +107,7 @@ main(int argc, char *argv[]) char *conf_file, *defpaths, *auxpaths; char *defos; #if HAVE_SQLITE3 - struct manpage *res; - char **auxargv; + struct manpage *res, *resp; size_t isec, i, sz; int prio, best_prio; char sec; @@ -111,6 +115,7 @@ main(int argc, char *argv[]) enum mandoclevel rc; enum outmode outmode; int show_usage; + int use_pager; int options; int c; @@ -145,9 +150,11 @@ main(int argc, char *argv[]) options = MPARSE_SO; defos = NULL; + use_pager = 1; show_usage = 0; outmode = OUTMODE_DEF; - while (-1 != (c = getopt(argc, argv, "aC:fI:ikM:m:O:S:s:T:VW:w"))) { + + while (-1 != (c = getopt(argc, argv, "aC:cfI:iklM:m:O:S:s:T:VW:w"))) { switch (c) { case 'a': outmode = OUTMODE_ALL; @@ -155,6 +162,9 @@ main(int argc, char *argv[]) case 'C': conf_file = optarg; break; + case 'c': + use_pager = 0; + break; case 'f': search.argmode = ARG_WORD; break; @@ -179,6 +189,10 @@ main(int argc, char *argv[]) case 'k': search.argmode = ARG_EXPR; break; + case 'l': + search.argmode = ARG_FILE; + outmode = OUTMODE_ALL; + break; case 'M': defpaths = optarg; break; @@ -219,10 +233,13 @@ main(int argc, char *argv[]) if (show_usage) usage(search.argmode); + /* Postprocess options. */ + if (outmode == OUTMODE_DEF) { switch (search.argmode) { case ARG_FILE: outmode = OUTMODE_ALL; + use_pager = 0; break; case ARG_NAME: outmode = OUTMODE_ONE; @@ -233,12 +250,25 @@ main(int argc, char *argv[]) } } + /* Parse arguments. */ + argc -= optind; argv += optind; #if HAVE_SQLITE3 - auxargv = NULL; + resp = NULL; #endif + /* Quirk for a man(1) section argument without -s. */ + + if (search.argmode == ARG_NAME && + argv[0] != NULL && + isdigit((unsigned char)argv[0][0]) && + (argv[0][1] == '\0' || !strcmp(argv[0], "3p"))) { + search.sec = argv[0]; + argv++; + argc--; + } + rc = MANDOCLEVEL_OK; /* man(1), whatis(1), apropos(1) */ @@ -255,7 +285,16 @@ main(int argc, char *argv[]) if( ! mansearch(&search, &paths, argc, argv, &res, &sz)) usage(search.argmode); manpath_free(&paths); + resp = res; + if (sz == 0) { + if (search.argmode == ARG_NAME) + fprintf(stderr, "%s: No entry for %s " + "in the manual.\n", progname, argv[0]); + rc = MANDOCLEVEL_BADARG; + goto out; + } + /* * For standard man(1) and -a output mode, * prepare for copying filename pointers @@ -264,15 +303,9 @@ main(int argc, char *argv[]) if (outmode == OUTMODE_ONE) { argc = 1; - argv[0] = res[0].file; - argv[1] = NULL; best_prio = 10; - } else if (outmode == OUTMODE_ALL) { + } else if (outmode == OUTMODE_ALL) argc = (int)sz; - argv = auxargv = mandoc_reallocarray( - NULL, sz + 1, sizeof(char *)); - argv[argc] = NULL; - } /* Iterate all matching manuals. */ @@ -283,9 +316,7 @@ main(int argc, char *argv[]) printf("%s - %s\n", res[i].names, res[i].output == NULL ? "" : res[i].output); - else if (outmode == OUTMODE_ALL) - argv[i] = res[i].file; - else { + else if (outmode == OUTMODE_ONE) { /* Search for the best section. */ isec = strcspn(res[i].file, "123456789"); sec = res[i].file[isec]; @@ -295,7 +326,7 @@ main(int argc, char *argv[]) if (prio >= best_prio) continue; best_prio = prio; - argv[0] = res[i].file; + resp = res + i; } } @@ -319,6 +350,9 @@ main(int argc, char *argv[]) if ( ! moptions(&options, auxpaths)) return((int)MANDOCLEVEL_BADARG); + if (use_pager && isatty(STDOUT_FILENO)) + spawn_pager(); + curp.mp = mparse_alloc(options, curp.wlevel, mmsg, defos); /* @@ -327,14 +361,23 @@ main(int argc, char *argv[]) if (OUTT_MAN == curp.outtype) mparse_keep(curp.mp); - if (NULL == *argv) + if (argc == 0) parse(&curp, STDIN_FILENO, "", &rc); - while (*argv) { - parse(&curp, -1, *argv, &rc); + while (argc) { +#if HAVE_SQLITE3 + if (resp != NULL) { + if (resp->form) + parse(&curp, -1, resp->file, &rc); + else + rc = passthrough(resp->file); + resp++; + } else +#endif + parse(&curp, -1, *argv++, &rc); if (MANDOCLEVEL_OK != rc && curp.wstop) break; - ++argv; + argc--; } if (curp.outfree) @@ -347,7 +390,6 @@ out: if (search.argmode != ARG_FILE) { mansearch_free(res, sz); mansearch_setup(0); - free(auxargv); } #endif @@ -370,22 +412,23 @@ usage(enum argmode argmode) switch (argmode) { case ARG_FILE: - fputs("usage: mandoc [-V] [-Ios=name] [-mformat]" - " [-Ooption] [-Toutput] [-Wlevel]\n" + fputs("usage: mandoc [-acfklV] [-Ios=name] " + "[-mformat] [-Ooption] [-Toutput] [-Wlevel]\n" "\t [file ...]\n", stderr); break; case ARG_NAME: - fputs("usage: man [-acfhkVw] [-C file] " + fputs("usage: man [-acfhklVw] [-C file] " "[-M path] [-m path] [-S arch] [-s section]\n" "\t [section] name ...\n", stderr); break; case ARG_WORD: - fputs("usage: whatis [-V] [-C file] [-M path] [-m path] " - "[-S arch] [-s section] name ...\n", stderr); + fputs("usage: whatis [-acfklVw] [-C file] " + "[-M path] [-m path] [-O outkey] [-S arch]\n" + "\t [-s section] name ...\n", stderr); break; case ARG_EXPR: - fputs("usage: apropos [-V] [-C file] [-M path] [-m path] " - "[-O outkey] [-S arch]\n" + fputs("usage: apropos [-acfklVw] [-C file] " + "[-M path] [-m path] [-O outkey] [-S arch]\n" "\t [-s section] expression ...\n", stderr); break; } @@ -505,6 +548,40 @@ parse(struct curparse *curp, int fd, const char *file, *level = rc; } +static enum mandoclevel +passthrough(const char *file) +{ + char buf[BUFSIZ]; + const char *syscall; + ssize_t nr, nw, off; + int fd; + + fd = open(file, O_RDONLY); + if (fd == -1) { + syscall = "open"; + goto fail; + } + + while ((nr = read(fd, buf, BUFSIZ)) != -1 && nr != 0) + for (off = 0; off < nr; off += nw) + if ((nw = write(STDOUT_FILENO, buf + off, + (size_t)(nr - off))) == -1 || nw == 0) { + syscall = "write"; + goto fail; + } + + if (nr == 0) { + close(fd); + return(MANDOCLEVEL_OK); + } + + syscall = "read"; +fail: + fprintf(stderr, "%s: %s: SYSERR: %s: %s", + progname, file, syscall, strerror(errno)); + return(MANDOCLEVEL_SYSERR); +} + static int moptions(int *options, char *arg) { @@ -620,4 +697,80 @@ mmsg(enum mandocerr t, enum mandoclevel lvl, fprintf(stderr, ": %s", msg); fputc('\n', stderr); +} + +static void +spawn_pager(void) +{ +#define MAX_PAGER_ARGS 16 + char *argv[MAX_PAGER_ARGS]; + const char *pager; + char *cp; + int fildes[2]; + int argc; + + if (pipe(fildes) == -1) { + fprintf(stderr, "%s: pipe: %s\n", + progname, strerror(errno)); + return; + } + + switch (fork()) { + case -1: + fprintf(stderr, "%s: fork: %s\n", + progname, strerror(errno)); + exit((int)MANDOCLEVEL_SYSERR); + case 0: + close(fildes[0]); + if (dup2(fildes[1], STDOUT_FILENO) == -1) { + fprintf(stderr, "%s: dup output: %s\n", + progname, strerror(errno)); + exit((int)MANDOCLEVEL_SYSERR); + } + return; + default: + break; + } + + /* The original process becomes the pager. */ + + close(fildes[1]); + if (dup2(fildes[0], STDIN_FILENO) == -1) { + fprintf(stderr, "%s: dup input: %s\n", + progname, strerror(errno)); + exit((int)MANDOCLEVEL_SYSERR); + } + + pager = getenv("MANPAGER"); + if (pager == NULL || *pager == '\0') + pager = getenv("PAGER"); + if (pager == NULL || *pager == '\0') + pager = "/usr/bin/more -s"; + cp = mandoc_strdup(pager); + + /* + * Parse the pager command into words. + * Intentionally do not do anything fancy here. + */ + + argc = 0; + while (argc + 1 < MAX_PAGER_ARGS) { + argv[argc++] = cp; + cp = strchr(cp, ' '); + if (cp == NULL) + break; + *cp++ = '\0'; + while (*cp == ' ') + cp++; + if (*cp == '\0') + break; + } + argv[argc] = NULL; + + /* Hand over to the pager. */ + + execvp(argv[0], argv); + fprintf(stderr, "%s: exec: %s\n", + progname, strerror(errno)); + exit((int)MANDOCLEVEL_SYSERR); }