=================================================================== RCS file: /cvs/mandoc/main.c,v retrieving revision 1.344 retrieving revision 1.349 diff -u -p -r1.344 -r1.349 --- mandoc/main.c 2020/02/24 21:16:31 1.344 +++ mandoc/main.c 2020/06/14 16:24:18 1.349 @@ -1,7 +1,7 @@ -/* $Id: main.c,v 1.344 2020/02/24 21:16:31 schwarze Exp $ */ +/* $Id: main.c,v 1.349 2020/06/14 16:24:18 schwarze Exp $ */ /* - * Copyright (c) 2008-2012 Kristaps Dzonsons * Copyright (c) 2010-2012, 2014-2020 Ingo Schwarze + * Copyright (c) 2008-2012 Kristaps Dzonsons * Copyright (c) 2010 Joerg Sonnenberger * * Permission to use, copy, modify, and distribute this software for any @@ -15,6 +15,8 @@ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + * + * Main program for mandoc(1), man(1), apropos(1), whatis(1), and help(1). */ #include "config.h" @@ -53,6 +55,7 @@ #include "man.h" #include "mandoc_parse.h" #include "tag.h" +#include "term_tag.h" #include "main.h" #include "manconf.h" #include "mansearch.h" @@ -105,8 +108,8 @@ static void parse(struct mparse *, int, const char static void passthrough(int, int); static void process_onefile(struct mparse *, struct manpage *, int, struct outstate *, struct manconf *); -static void run_pager(struct tag_files *); -static pid_t spawn_pager(struct tag_files *); +static void run_pager(struct tag_files *, char *); +static pid_t spawn_pager(struct tag_files *, char *); static void usage(enum argmode) __attribute__((__noreturn__)); static int woptions(char *, enum mandoc_os *, int *); @@ -598,7 +601,6 @@ main(int argc, char *argv[]) * readable: Maybe it won't be needed after all. */ startdir = open(".", O_RDONLY | O_DIRECTORY); - for (i = 0; i < ressz; i++) { process_onefile(mp, res + i, startdir, &outst, &conf); if (outst.wstop && mandoc_msg_getrc() != MANDOCLEVEL_OK) @@ -608,7 +610,10 @@ main(int argc, char *argv[]) (void)fchdir(startdir); close(startdir); } - + if (conf.output.tag != NULL && conf.output.tag_found == 0) { + mandoc_msg(MANDOCERR_TAG, 0, 0, "%s", conf.output.tag); + conf.output.tag = NULL; + } if (outst.outdata != NULL) { switch (outst.outtype) { case OUTT_HTML: @@ -637,10 +642,9 @@ out: manconf_free(&conf); if (outst.tag_files != NULL) { - fclose(stdout); - tag_write(); - run_pager(outst.tag_files); - tag_unlink(); + if (term_tag_close() != -1) + run_pager(outst.tag_files, conf.output.tag); + term_tag_unlink(); } else if (outst.had_output && outst.outtype != OUTT_LINT) mandoc_msg_summary(); @@ -833,9 +837,8 @@ process_onefile(struct mparse *mp, struct manpage *res if (outst->use_pager) { outst->use_pager = 0; - outst->tag_files = tag_init(conf->output.tag); + outst->tag_files = term_tag_init(); } - if (outst->had_output && outst->outtype <= OUTT_UTF8) { if (outst->outdata == NULL) outdata_alloc(outst, &conf->output); @@ -853,7 +856,7 @@ process_onefile(struct mparse *mp, struct manpage *res if (outst->tag_files != NULL) { mandoc_msg(MANDOCERR_WRITE, 0, 0, "%s: %s", outst->tag_files->ofn, strerror(errno)); - tag_unlink(); + term_tag_unlink(); outst->tag_files = NULL; } else mandoc_msg(MANDOCERR_WRITE, 0, 0, "%s", @@ -893,7 +896,7 @@ parse(struct mparse *mp, int fd, const char *file, if (outst->outdata == NULL) outdata_alloc(outst, outconf); else if (outst->outtype == OUTT_HTML) - html_reset(outst); + html_reset(outst->outdata); mandoc_xr_reset(); meta = mparse_result(mp); @@ -948,6 +951,9 @@ parse(struct mparse *mp, int fd, const char *file, break; } } + if (outconf->tag != NULL && outconf->tag_found == 0 && + tag_exists(outconf->tag)) + outconf->tag_found = 1; if (mandoc_msg_getmin() < MANDOCERR_STYLE) check_xr(); } @@ -1138,7 +1144,7 @@ woptions(char *arg, enum mandoc_os *os_e, int *wstop) * then fork the pager and wait for the user to close it. */ static void -run_pager(struct tag_files *tag_files) +run_pager(struct tag_files *tag_files, char *tag_target) { int signum, status; pid_t man_pgid, tc_pgid; @@ -1153,10 +1159,10 @@ run_pager(struct tag_files *tag_files) for (;;) { /* Stop here until moved to the foreground. */ - tc_pgid = tcgetpgrp(tag_files->ofd); + tc_pgid = tcgetpgrp(STDOUT_FILENO); if (tc_pgid != man_pgid) { if (tc_pgid == pager_pid) { - (void)tcsetpgrp(tag_files->ofd, man_pgid); + (void)tcsetpgrp(STDOUT_FILENO, man_pgid); if (signum == SIGTTIN) continue; } else @@ -1168,10 +1174,10 @@ run_pager(struct tag_files *tag_files) /* Once in the foreground, activate the pager. */ if (pager_pid) { - (void)tcsetpgrp(tag_files->ofd, pager_pid); + (void)tcsetpgrp(STDOUT_FILENO, pager_pid); kill(pager_pid, SIGCONT); } else - pager_pid = spawn_pager(tag_files); + pager_pid = spawn_pager(tag_files, tag_target); /* Wait for the pager to stop or exit. */ @@ -1192,7 +1198,7 @@ run_pager(struct tag_files *tag_files) } static pid_t -spawn_pager(struct tag_files *tag_files) +spawn_pager(struct tag_files *tag_files, char *tag_target) { const struct timespec timeout = { 0, 100000000 }; /* 0.1s */ #define MAX_PAGER_ARGS 16 @@ -1205,6 +1211,9 @@ spawn_pager(struct tag_files *tag_files) int argc, use_ofn; pid_t pager_pid; + assert(tag_files->ofd == -1); + assert(tag_files->tfs == NULL); + pager = getenv("MANPAGER"); if (pager == NULL || *pager == '\0') pager = getenv("PAGER"); @@ -1239,9 +1248,9 @@ spawn_pager(struct tag_files *tag_files) if (strcmp(cp, "less") == 0) { argv[argc++] = mandoc_strdup("-T"); argv[argc++] = tag_files->tfn; - if (tag_files->tagname != NULL) { + if (tag_target != NULL) { argv[argc++] = mandoc_strdup("-t"); - argv[argc++] = tag_files->tagname; + argv[argc++] = tag_target; use_ofn = 0; } } @@ -1259,7 +1268,7 @@ spawn_pager(struct tag_files *tag_files) break; default: (void)setpgid(pager_pid, 0); - (void)tcsetpgrp(tag_files->ofd, pager_pid); + (void)tcsetpgrp(STDOUT_FILENO, pager_pid); #if HAVE_PLEDGE if (pledge("stdio rpath tmppath tty proc", NULL) == -1) { mandoc_msg(MANDOCERR_PLEDGE, 0, 0, @@ -1271,16 +1280,10 @@ spawn_pager(struct tag_files *tag_files) return pager_pid; } - /* The child process becomes the pager. */ - - if (dup2(tag_files->ofd, STDOUT_FILENO) == -1) { - mandoc_msg(MANDOCERR_DUP, 0, 0, "%s", strerror(errno)); - _exit(mandoc_msg_getrc()); - } - close(tag_files->ofd); - assert(tag_files->tfd == -1); - - /* Do not start the pager before controlling the terminal. */ + /* + * The child process becomes the pager. + * Do not start it before controlling the terminal. + */ while (tcgetpgrp(STDOUT_FILENO) != getpid()) nanosleep(&timeout, NULL);