Manually tag the section option.

[mandoc.git] / main.c

diff --git a/main.c b/main.c
index 8c3ded9b1b7a9dcf8d15432b7ed18a03a5c39c69..cafbeb9f0b9e37eb0374c7f715cb6c32c08f81a5 100644 (file)
--- a/main.c
+++ b/main.c
@@ -1,4 +1,4 @@
-/* $Id: main.c,v 1.345 2020/03/13 15:32:28 schwarze Exp $ */
+/* $Id: main.c,v 1.350 2020/06/15 17:25:42 schwarze Exp $ */

 /*
  * Copyright (c) 2010-2012, 2014-2020 Ingo Schwarze <schwarze@openbsd.org>
  * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
 /*
  * Copyright (c) 2010-2012, 2014-2020 Ingo Schwarze <schwarze@openbsd.org>
  * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>


@@ -54,6 +54,7 @@
 #include "mdoc.h"
 #include "man.h"
 #include "mandoc_parse.h"
 #include "mdoc.h"
 #include "man.h"
 #include "mandoc_parse.h"

+#include "tag.h"

 #include "term_tag.h"
 #include "main.h"
 #include "manconf.h"
 #include "term_tag.h"
 #include "main.h"
 #include "manconf.h"


@@ -107,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              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 outstate *, char *);
+static pid_t             spawn_pager(struct outstate *, char *);

 static void              usage(enum argmode) __attribute__((__noreturn__));
 static int               woptions(char *, enum mandoc_os *, int *);
 
 static void              usage(enum argmode) __attribute__((__noreturn__));
 static int               woptions(char *, enum mandoc_os *, int *);
 


@@ -609,6 +610,10 @@ main(int argc, char *argv[])
                (void)fchdir(startdir);
                close(startdir);
        }
                (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:
        if (outst.outdata != NULL) {
                switch (outst.outtype) {
                case OUTT_HTML:


@@ -617,7 +622,6 @@ main(int argc, char *argv[])
                case OUTT_UTF8:
                case OUTT_LOCALE:
                case OUTT_ASCII:
                case OUTT_UTF8:
                case OUTT_LOCALE:
                case OUTT_ASCII:

-                       term_tag_finish();

                        ascii_free(outst.outdata);
                        break;
                case OUTT_PDF:
                        ascii_free(outst.outdata);
                        break;
                case OUTT_PDF:


@@ -638,8 +642,8 @@ out:
                manconf_free(&conf);
 
        if (outst.tag_files != NULL) {
                manconf_free(&conf);
 
        if (outst.tag_files != NULL) {

-               fclose(stdout);
-               run_pager(outst.tag_files);
+               if (term_tag_close() != -1)
+                       run_pager(&outst, conf.output.tag);

                term_tag_unlink();
        } else if (outst.had_output && outst.outtype != OUTT_LINT)
                mandoc_msg_summary();
                term_tag_unlink();
        } else if (outst.had_output && outst.outtype != OUTT_LINT)
                mandoc_msg_summary();


@@ -831,16 +835,14 @@ process_onefile(struct mparse *mp, struct manpage *resp, int startdir,
        } else
                fd = STDIN_FILENO;
 
        } else
                fd = STDIN_FILENO;
 

-       if (outst->outtype <= OUTT_UTF8) {
-               if (outst->use_pager) {
-                       outst->use_pager = 0;
-                       outst->tag_files = term_tag_init(conf->output.tag);
-               }
-               if (outst->had_output) {
-                       if (outst->outdata == NULL)
-                               outdata_alloc(outst, &conf->output);
-                       terminal_sepline(outst->outdata);
-               }
+       if (outst->use_pager) {
+               outst->use_pager = 0;
+               outst->tag_files = term_tag_init();
+       }
+       if (outst->had_output && outst->outtype <= OUTT_UTF8) {
+               if (outst->outdata == NULL)
+                       outdata_alloc(outst, &conf->output);
+               terminal_sepline(outst->outdata);

        }
 
        if (resp->form == FORM_SRC)
        }
 
        if (resp->form == FORM_SRC)


@@ -894,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)
        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);
 
        mandoc_xr_reset();
        meta = mparse_result(mp);


@@ -949,6 +951,9 @@ parse(struct mparse *mp, int fd, const char *file,
                        break;
                }
        }
                        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();
 }
        if (mandoc_msg_getmin() < MANDOCERR_STYLE)
                check_xr();
 }


@@ -1139,29 +1144,29 @@ woptions(char *arg, enum mandoc_os *os_e, int *wstop)
  * then fork the pager and wait for the user to close it.
  */
 static void
  * then fork the pager and wait for the user to close it.
  */
 static void

-run_pager(struct tag_files *tag_files)
+run_pager(struct outstate *outst, char *tag_target)

 {
        int      signum, status;
        pid_t    man_pgid, tc_pgid;
        pid_t    pager_pid, wait_pid;
 
        man_pgid = getpgid(0);
 {
        int      signum, status;
        pid_t    man_pgid, tc_pgid;
        pid_t    pager_pid, wait_pid;
 
        man_pgid = getpgid(0);

-       tag_files->tcpgid = man_pgid == getpid() ? getpgid(getppid()) :
-           man_pgid;
+       outst->tag_files->tcpgid =
+           man_pgid == getpid() ? getpgid(getppid()) : man_pgid;

        pager_pid = 0;
        signum = SIGSTOP;
 
        for (;;) {
                /* Stop here until moved to the foreground. */
 
        pager_pid = 0;
        signum = SIGSTOP;
 
        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) {
                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
                                if (signum == SIGTTIN)
                                        continue;
                        } else

-                               tag_files->tcpgid = tc_pgid;
+                               outst->tag_files->tcpgid = tc_pgid;

                        kill(0, signum);
                        continue;
                }
                        kill(0, signum);
                        continue;
                }


@@ -1169,10 +1174,10 @@ run_pager(struct tag_files *tag_files)
                /* Once in the foreground, activate the pager. */
 
                if (pager_pid) {
                /* 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
                        kill(pager_pid, SIGCONT);
                } else

-                       pager_pid = spawn_pager(tag_files);
+                       pager_pid = spawn_pager(outst, tag_target);

 
                /* Wait for the pager to stop or exit. */
 
 
                /* Wait for the pager to stop or exit. */
 


@@ -1193,7 +1198,7 @@ run_pager(struct tag_files *tag_files)
 }
 
 static pid_t
 }
 
 static pid_t

-spawn_pager(struct tag_files *tag_files)
+spawn_pager(struct outstate *outst, char *tag_target)

 {
        const struct timespec timeout = { 0, 100000000 };  /* 0.1s */
 #define MAX_PAGER_ARGS 16
 {
        const struct timespec timeout = { 0, 100000000 };  /* 0.1s */
 #define MAX_PAGER_ARGS 16


@@ -1206,6 +1211,9 @@ spawn_pager(struct tag_files *tag_files)
        int              argc, use_ofn;
        pid_t            pager_pid;
 
        int              argc, use_ofn;
        pid_t            pager_pid;
 

+       assert(outst->tag_files->ofd == -1);
+       assert(outst->tag_files->tfs == NULL);
+

        pager = getenv("MANPAGER");
        if (pager == NULL || *pager == '\0')
                pager = getenv("PAGER");
        pager = getenv("MANPAGER");
        if (pager == NULL || *pager == '\0')
                pager = getenv("PAGER");


@@ -1235,21 +1243,28 @@ spawn_pager(struct tag_files *tag_files)
 
        use_ofn = 1;
 #if HAVE_LESS_T
 
        use_ofn = 1;
 #if HAVE_LESS_T

-       if (*tag_files->tfn != '\0' && (cmdlen = strlen(argv[0])) >= 4) {
+       if (*outst->tag_files->tfn != '\0' &&
+           (cmdlen = strlen(argv[0])) >= 4) {

                cp = argv[0] + cmdlen - 4;
                if (strcmp(cp, "less") == 0) {
                        argv[argc++] = mandoc_strdup("-T");
                cp = argv[0] + cmdlen - 4;
                if (strcmp(cp, "less") == 0) {
                        argv[argc++] = mandoc_strdup("-T");

-                       argv[argc++] = tag_files->tfn;
-                       if (tag_files->tagname != NULL) {
+                       argv[argc++] = outst->tag_files->tfn;
+                       if (tag_target != NULL) {

                                argv[argc++] = mandoc_strdup("-t");
                                argv[argc++] = mandoc_strdup("-t");

-                               argv[argc++] = tag_files->tagname;
+                               argv[argc++] = tag_target;

                                use_ofn = 0;
                        }
                }
        }
 #endif
                                use_ofn = 0;
                        }
                }
        }
 #endif

-       if (use_ofn)
-               argv[argc++] = tag_files->ofn;
+       if (use_ofn) {
+               if (outst->outtype == OUTT_HTML && tag_target != NULL)
+                       mandoc_asprintf(&argv[argc], "file://%s#%s",
+                           outst->tag_files->ofn, tag_target);
+               else
+                       argv[argc] = outst->tag_files->ofn;
+               argc++;
+       }

        argv[argc] = NULL;
 
        switch (pager_pid = fork()) {
        argv[argc] = NULL;
 
        switch (pager_pid = fork()) {


@@ -1260,7 +1275,7 @@ spawn_pager(struct tag_files *tag_files)
                break;
        default:
                (void)setpgid(pager_pid, 0);
                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,
 #if HAVE_PLEDGE
                if (pledge("stdio rpath tmppath tty proc", NULL) == -1) {
                        mandoc_msg(MANDOCERR_PLEDGE, 0, 0,


@@ -1268,20 +1283,14 @@ spawn_pager(struct tag_files *tag_files)
                        exit(mandoc_msg_getrc());
                }
 #endif
                        exit(mandoc_msg_getrc());
                }
 #endif

-               tag_files->pager_pid = pager_pid;
+               outst->tag_files->pager_pid = pager_pid;

                return pager_pid;
        }
 
                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->tfs == NULL);
-
-       /* 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);
 
        while (tcgetpgrp(STDOUT_FILENO) != getpid())
                nanosleep(&timeout, NULL);