=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/main.c,v retrieving revision 1.148 retrieving revision 1.149 diff -c -r1.148 -r1.149 *** src/usr.bin/mandoc/main.c 2015/07/21 03:26:02 1.148 --- src/usr.bin/mandoc/main.c 2015/07/28 18:38:05 1.149 *************** *** 1,4 **** ! /* $OpenBSD: main.c,v 1.148 2015/07/21 03:26:02 schwarze Exp $ */ /* * Copyright (c) 2008-2012 Kristaps Dzonsons * Copyright (c) 2010-2012, 2014, 2015 Ingo Schwarze --- 1,4 ---- ! /* $OpenBSD: main.c,v 1.149 2015/07/28 18:38:05 schwarze Exp $ */ /* * Copyright (c) 2008-2012 Kristaps Dzonsons * Copyright (c) 2010-2012, 2014, 2015 Ingo Schwarze *************** *** 88,94 **** 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 *); int mandocdb(int, char**); static int moptions(int *, char *); --- 88,93 ---- *************** *** 96,102 **** const char *, int, int, const char *); 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 *); --- 95,101 ---- const char *, int, int, const char *); static void parse(struct curparse *, int, const char *); static void passthrough(const char *, int, int); ! static pid_t spawn_pager(struct tag_files *); static int toptions(struct curparse *, char *); static void usage(enum argmode) __attribute__((noreturn)); static int woptions(struct curparse *, char *); *************** *** 114,119 **** --- 113,119 ---- struct manconf conf; struct curparse curp; struct mansearch search; + struct tag_files *tag_files; char *auxpaths; char *defos; unsigned char *uc; *************** *** 127,134 **** int fd; int show_usage; int options; int c; - pid_t pager_pid; /* 0: don't use; 1: not yet spawned. */ if (argc < 1) progname = "mandoc"; --- 127,134 ---- int fd; int show_usage; int options; + int use_pager; int c; if (argc < 1) progname = "mandoc"; *************** *** 170,176 **** options = MPARSE_SO | MPARSE_UTF8 | MPARSE_LATIN1; defos = NULL; ! pager_pid = 1; show_usage = 0; outmode = OUTMODE_DEF; --- 170,177 ---- options = MPARSE_SO | MPARSE_UTF8 | MPARSE_LATIN1; defos = NULL; ! use_pager = 1; ! tag_files = NULL; show_usage = 0; outmode = OUTMODE_DEF; *************** *** 184,197 **** conf_file = optarg; break; case 'c': ! pager_pid = 0; break; case 'f': search.argmode = ARG_WORD; break; case 'h': conf.output.synopsisonly = 1; ! pager_pid = 0; outmode = OUTMODE_ALL; break; case 'I': --- 185,198 ---- conf_file = optarg; break; case 'c': ! use_pager = 0; break; case 'f': search.argmode = ARG_WORD; break; case 'h': conf.output.synopsisonly = 1; ! use_pager = 0; outmode = OUTMODE_ALL; break; case 'I': *************** *** 267,273 **** switch (search.argmode) { case ARG_FILE: outmode = OUTMODE_ALL; ! pager_pid = 0; break; case ARG_NAME: outmode = OUTMODE_ONE; --- 268,274 ---- switch (search.argmode) { case ARG_FILE: outmode = OUTMODE_ALL; ! use_pager = 0; break; case ARG_NAME: outmode = OUTMODE_ONE; *************** *** 398,405 **** if (search.argmode == ARG_FILE && ! moptions(&options, auxpaths)) return((int)MANDOCLEVEL_BADARG); ! if (pager_pid == 1 && isatty(STDOUT_FILENO) == 0) ! pager_pid = 0; curp.mchars = mchars_alloc(); curp.mp = mparse_alloc(options, curp.wlevel, mmsg, --- 399,406 ---- if (search.argmode == ARG_FILE && ! moptions(&options, auxpaths)) return((int)MANDOCLEVEL_BADARG); ! if (use_pager && ! isatty(STDOUT_FILENO)) ! use_pager = 0; curp.mchars = mchars_alloc(); curp.mp = mparse_alloc(options, curp.wlevel, mmsg, *************** *** 412,419 **** mparse_keep(curp.mp); if (argc < 1) { ! if (pager_pid == 1) ! pager_pid = spawn_pager(); parse(&curp, STDIN_FILENO, ""); } --- 413,420 ---- mparse_keep(curp.mp); if (argc < 1) { ! if (use_pager) ! tag_files = tag_init(); parse(&curp, STDIN_FILENO, ""); } *************** *** 424,431 **** rc = rctmp; if (fd != -1) { ! if (pager_pid == 1) ! pager_pid = spawn_pager(); if (resp == NULL) parse(&curp, fd, *argv); --- 425,434 ---- rc = rctmp; if (fd != -1) { ! if (use_pager) { ! tag_files = tag_init(); ! use_pager = 0; ! } if (resp == NULL) parse(&curp, fd, *argv); *************** *** 467,481 **** 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); tag_write(); ! waitpid(pager_pid, NULL, 0); tag_unlink(); } --- 470,483 ---- free(defos); /* ! * When using a pager, finish writing both temporary files, ! * fork it, wait for the user to close it, and clean up. */ ! if (tag_files != NULL) { fclose(stdout); tag_write(); ! waitpid(spawn_pager(tag_files), NULL, 0); tag_unlink(); } *************** *** 922,943 **** fputc('\n', stderr); } - static void - handle_sigpipe(int signum) - { - - exit((int)rc); - } - static pid_t ! spawn_pager(void) { #define MAX_PAGER_ARGS 16 char *argv[MAX_PAGER_ARGS]; const char *pager; char *cp; size_t cmdlen; - int fildes[2]; int argc; pid_t pager_pid; --- 924,937 ---- fputc('\n', stderr); } static pid_t ! spawn_pager(struct tag_files *tag_files) { #define MAX_PAGER_ARGS 16 char *argv[MAX_PAGER_ARGS]; const char *pager; char *cp; size_t cmdlen; int argc; pid_t pager_pid; *************** *** 966,994 **** break; } ! /* Read all text right away and use the tag file. */ ! for (;;) { ! if ((cmdlen = strlen(argv[0])) < 4) ! break; cp = argv[0] + cmdlen - 4; ! if (strcmp(cp, "less") && strcmp(cp, "more")) ! break; ! if ((cp = tag_init()) == NULL) ! break; ! argv[argc++] = mandoc_strdup("+G1G"); ! argv[argc++] = mandoc_strdup("-T"); ! argv[argc++] = cp; ! break; } argv[argc] = NULL; - if (pipe(fildes) == -1) { - fprintf(stderr, "%s: pipe: %s\n", - progname, strerror(errno)); - return(0); - } - switch (pager_pid = fork()) { case -1: fprintf(stderr, "%s: fork: %s\n", --- 960,977 ---- break; } ! /* For more(1) and less(1), use the tag file. */ ! if ((cmdlen = strlen(argv[0])) >= 4) { cp = argv[0] + cmdlen - 4; ! if (strcmp(cp, "less") == 0 || strcmp(cp, "more") == 0) { ! argv[argc++] = mandoc_strdup("-T"); ! argv[argc++] = tag_files->tfn; ! } } + argv[argc++] = tag_files->ofn; argv[argc] = NULL; switch (pager_pid = fork()) { case -1: fprintf(stderr, "%s: fork: %s\n", *************** *** 997,1025 **** 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); - } - close(fildes[1]); - signal(SIGPIPE, handle_sigpipe); return(pager_pid); } /* The child 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); } ! close(fildes[0]); ! ! /* Hand over to the pager. */ ! execvp(argv[0], argv); fprintf(stderr, "%s: exec %s: %s\n", progname, argv[0], strerror(errno)); --- 980,996 ---- case 0: break; default: return(pager_pid); } /* The child process becomes the pager. */ ! if (dup2(tag_files->ofd, STDOUT_FILENO) == -1) { ! fprintf(stderr, "pager: stdout: %s\n", strerror(errno)); exit((int)MANDOCLEVEL_SYSERR); } ! close(tag_files->ofd); ! close(tag_files->tfd); execvp(argv[0], argv); fprintf(stderr, "%s: exec %s: %s\n", progname, argv[0], strerror(errno));