=================================================================== RCS file: /cvs/mandoc/main.c,v retrieving revision 1.223 retrieving revision 1.227 diff -u -p -r1.223 -r1.227 --- mandoc/main.c 2015/03/06 09:24:59 1.223 +++ mandoc/main.c 2015/03/17 13:35:52 1.227 @@ -1,4 +1,4 @@ -/* $Id: main.c,v 1.223 2015/03/06 09:24:59 kristaps Exp $ */ +/* $Id: main.c,v 1.227 2015/03/17 13:35:52 schwarze Exp $ */ /* * Copyright (c) 2008-2012 Kristaps Dzonsons * Copyright (c) 2010-2012, 2014, 2015 Ingo Schwarze @@ -20,12 +20,14 @@ #include #include /* MACHINE */ +#include #include #include #include #include #include +#include #include #include #include @@ -91,6 +93,7 @@ static int fs_lookup(const struct manpaths *, static void fs_search(const struct mansearch *, const struct manpaths *, int, char**, struct manpage **, size_t *); +static void handle_sigpipe(int); static int koptions(int *, char *); #if HAVE_SQLITE3 int mandocdb(int, char**); @@ -98,10 +101,9 @@ int mandocdb(int, char**); static int moptions(int *, char *); 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 *, int, int); -static void spawn_pager(void); +static void parse(struct curparse *, int, const char *); +static void passthrough(const char *, int, int); +static pid_t spawn_pager(void); static int toptions(struct curparse *, char *); static void usage(enum argmode) __attribute__((noreturn)); static int woptions(struct curparse *, char *); @@ -110,6 +112,7 @@ static const int sec_prios[] = {1, 4, 5, 8, 6, 3, 7, 2 static char help_arg[] = "help"; static char *help_argv[] = {help_arg, NULL}; static const char *progname; +static enum mandoclevel rc; int @@ -126,13 +129,13 @@ main(int argc, char *argv[]) size_t isec, i, sz; int prio, best_prio, synopsis_only; char sec; - enum mandoclevel rc, rctmp; + enum mandoclevel rctmp; enum outmode outmode; int fd; int show_usage; - int use_pager; int options; int c; + pid_t pager_pid; /* 0: don't use; 1: not yet spawned. */ if (argc < 1) progname = "mandoc"; @@ -174,7 +177,7 @@ main(int argc, char *argv[]) options = MPARSE_SO | MPARSE_UTF8 | MPARSE_LATIN1; defos = NULL; - use_pager = 1; + pager_pid = 1; show_usage = 0; synopsis_only = 0; outmode = OUTMODE_DEF; @@ -189,7 +192,7 @@ main(int argc, char *argv[]) conf_file = optarg; break; case 'c': - use_pager = 0; + pager_pid = 0; break; case 'f': search.argmode = ARG_WORD; @@ -197,7 +200,7 @@ main(int argc, char *argv[]) case 'h': (void)strlcat(curp.outopts, "synopsis,", BUFSIZ); synopsis_only = 1; - use_pager = 0; + pager_pid = 0; outmode = OUTMODE_ALL; break; case 'I': @@ -272,7 +275,7 @@ main(int argc, char *argv[]) switch (search.argmode) { case ARG_FILE: outmode = OUTMODE_ALL; - use_pager = 0; + pager_pid = 0; break; case ARG_NAME: outmode = OUTMODE_ONE; @@ -417,9 +420,9 @@ main(int argc, char *argv[]) mparse_keep(curp.mp); if (argc < 1) { - if (use_pager && isatty(STDOUT_FILENO)) - spawn_pager(); - parse(&curp, STDIN_FILENO, "", &rc); + if (pager_pid == 1 && isatty(STDOUT_FILENO)) + pager_pid = spawn_pager(); + parse(&curp, STDIN_FILENO, ""); } while (argc > 0) { @@ -429,22 +432,17 @@ main(int argc, char *argv[]) rc = rctmp; if (fd != -1) { - if (use_pager && isatty(STDOUT_FILENO)) - spawn_pager(); - use_pager = 0; + if (pager_pid == 1 && isatty(STDOUT_FILENO)) + pager_pid = spawn_pager(); if (resp == NULL) - parse(&curp, fd, *argv, &rc); + parse(&curp, fd, *argv); else if (resp->form & FORM_SRC) { /* For .so only; ignore failure. */ chdir(paths.paths[resp->ipath]); - parse(&curp, fd, resp->file, &rc); - } else { - rctmp = passthrough(resp->file, fd, - synopsis_only); - if (rc < rctmp) - rc = rctmp; - } + parse(&curp, fd, resp->file); + } else + passthrough(resp->file, fd, synopsis_only); rctmp = mparse_wait(curp.mp); if (rc < rctmp) @@ -481,6 +479,17 @@ out: free(defos); + /* + * If a pager is attached, flush the pipe leading to it + * and signal end of file such that the user can browse + * to the end. Then wait for the user to close the pager. + */ + + if (pager_pid != 0 && pager_pid != 1) { + fclose(stdout); + waitpid(pager_pid, NULL, 0); + } + return((int)rc); } @@ -618,10 +627,9 @@ fs_search(const struct mansearch *cfg, const struct ma } static void -parse(struct curparse *curp, int fd, const char *file, - enum mandoclevel *level) +parse(struct curparse *curp, int fd, const char *file) { - enum mandoclevel rc; + enum mandoclevel rctmp; struct mdoc *mdoc; struct man *man; @@ -630,15 +638,17 @@ parse(struct curparse *curp, int fd, const char *file, assert(file); assert(fd >= -1); - rc = mparse_readfd(curp->mp, fd, file); + rctmp = mparse_readfd(curp->mp, fd, file); + if (rc < rctmp) + rc = rctmp; /* * With -Wstop and warnings or errors of at least the requested * level, do not produce output. */ - if (MANDOCLEVEL_OK != rc && curp->wstop) - goto cleanup; + if (rctmp != MANDOCLEVEL_OK && curp->wstop) + return; /* If unset, allocate output dev now (if applicable). */ @@ -716,13 +726,9 @@ parse(struct curparse *curp, int fd, const char *file, (*curp->outman)(curp->outdata, man); if (mdoc && curp->outmdoc) (*curp->outmdoc)(curp->outdata, mdoc); - -cleanup: - if (*level < rc) - *level = rc; } -static enum mandoclevel +static void passthrough(const char *file, int fd, int synopsis_only) { const char synb[] = "S\bSY\bYN\bNO\bOP\bPS\bSI\bIS\bS"; @@ -780,12 +786,13 @@ passthrough(const char *file, int fd, int synopsis_onl done: fclose(stream); - return(MANDOCLEVEL_OK); + return; fail: fprintf(stderr, "%s: %s: SYSERR: %s: %s", progname, file, syscall, strerror(errno)); - return(MANDOCLEVEL_SYSERR); + if (rc < MANDOCLEVEL_SYSERR) + rc = MANDOCLEVEL_SYSERR; } static int @@ -930,6 +937,13 @@ mmsg(enum mandocerr t, enum mandoclevel lvl, } static void +handle_sigpipe(int signum) +{ + + exit((int)rc); +} + +static pid_t spawn_pager(void) { #define MAX_PAGER_ARGS 16 @@ -938,31 +952,34 @@ spawn_pager(void) char *cp; int fildes[2]; int argc; + pid_t pager_pid; if (pipe(fildes) == -1) { fprintf(stderr, "%s: pipe: %s\n", progname, strerror(errno)); - return; + return(0); } - switch (fork()) { + switch (pager_pid = fork()) { case -1: fprintf(stderr, "%s: fork: %s\n", progname, strerror(errno)); exit((int)MANDOCLEVEL_SYSERR); case 0: + break; + default: 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; + close(fildes[1]); + signal(SIGPIPE, handle_sigpipe); + return(pager_pid); } - /* The original process becomes the pager. */ + /* The child process becomes the pager. */ close(fildes[1]); if (dup2(fildes[0], STDIN_FILENO) == -1) { @@ -970,6 +987,7 @@ spawn_pager(void) progname, strerror(errno)); exit((int)MANDOCLEVEL_SYSERR); } + close(fildes[0]); pager = getenv("MANPAGER"); if (pager == NULL || *pager == '\0')