Correct an embarrassing spelling mistake:

[mandoc.git] / main.c

diff --git a/main.c b/main.c
index 63c94bdb1b88d5fc4958debb82df8f6fb82a6e00..161cb864c964eb70c333632bd00a4dd271b8f308 100644 (file)
--- a/main.c
+++ b/main.c
@@ -1,4 +1,4 @@
-/* $Id: main.c,v 1.349 2020/06/14 16:24:18 schwarze Exp $ */
+/* $Id: main.c,v 1.353 2020/08/07 20:56:55 schwarze Exp $ */
 /*
  * Copyright (c) 2010-2012, 2014-2020 Ingo Schwarze <schwarze@openbsd.org>
  * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
@@ -108,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 *, char *);
-static pid_t             spawn_pager(struct tag_files *, char *);
+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 *);
 
@@ -165,7 +165,7 @@ main(int argc, char *argv[])
                return mandocdb(argc, argv);
 
 #if HAVE_PLEDGE
-       if (pledge("stdio rpath tmppath tty proc exec", NULL) == -1) {
+       if (pledge("stdio rpath wpath cpath tmppath tty proc exec", NULL) == -1) {
                mandoc_msg(MANDOCERR_PLEDGE, 0, 0, "%s", strerror(errno));
                return mandoc_msg_getrc();
        }
@@ -373,7 +373,9 @@ main(int argc, char *argv[])
 
        if (outmode == OUTMODE_FLN ||
            outmode == OUTMODE_LST ||
-           !isatty(STDOUT_FILENO))
+           (conf.output.outfilename == NULL &&
+            conf.output.tagfilename == NULL &&
+            isatty(STDOUT_FILENO) == 0))
                outst.use_pager = 0;
 
        if (outst.use_pager &&
@@ -387,12 +389,16 @@ main(int argc, char *argv[])
        }
 
 #if HAVE_PLEDGE
-       if (outst.use_pager == 0) {
-               if (pledge("stdio rpath", NULL) == -1) {
-                       mandoc_msg(MANDOCERR_PLEDGE, 0, 0,
-                           "%s", strerror(errno));
-                       return mandoc_msg_getrc();
-               }
+       if (outst.use_pager == 0)
+               c = pledge("stdio rpath", NULL);
+       else if (conf.output.outfilename != NULL ||
+           conf.output.tagfilename != NULL)
+               c = pledge("stdio rpath wpath cpath", NULL);
+       else
+               c = pledge("stdio rpath tmppath tty proc exec", NULL);
+       if (c == -1) {
+               mandoc_msg(MANDOCERR_PLEDGE, 0, 0, "%s", strerror(errno));
+               return mandoc_msg_getrc();
        }
 #endif
 
@@ -642,8 +648,10 @@ out:
                manconf_free(&conf);
 
        if (outst.tag_files != NULL) {
-               if (term_tag_close() != -1)
-                       run_pager(outst.tag_files, conf.output.tag);
+               if (term_tag_close() != -1 &&
+                   conf.output.outfilename == NULL &&
+                   conf.output.tagfilename == NULL)
+                       run_pager(&outst, conf.output.tag);
                term_tag_unlink();
        } else if (outst.had_output && outst.outtype != OUTT_LINT)
                mandoc_msg_summary();
@@ -837,7 +845,17 @@ process_onefile(struct mparse *mp, struct manpage *resp, int startdir,
 
        if (outst->use_pager) {
                outst->use_pager = 0;
-               outst->tag_files = term_tag_init();
+               outst->tag_files = term_tag_init(conf->output.outfilename,
+                   conf->output.tagfilename);
+#if HAVE_PLEDGE
+               if ((conf->output.outfilename != NULL ||
+                    conf->output.tagfilename != NULL) &&
+                   pledge("stdio rpath cpath", NULL) == -1) {
+                       mandoc_msg(MANDOCERR_PLEDGE, 0, 0,
+                           "%s", strerror(errno));
+                       exit(mandoc_msg_getrc());
+               }
+#endif
        }
        if (outst->had_output && outst->outtype <= OUTT_UTF8) {
                if (outst->outdata == NULL)
@@ -1144,15 +1162,15 @@ 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, char *tag_target)
+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);
-       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;
 
@@ -1166,7 +1184,7 @@ run_pager(struct tag_files *tag_files, char *tag_target)
                                if (signum == SIGTTIN)
                                        continue;
                        } else
-                               tag_files->tcpgid = tc_pgid;
+                               outst->tag_files->tcpgid = tc_pgid;
                        kill(0, signum);
                        continue;
                }
@@ -1177,7 +1195,7 @@ run_pager(struct tag_files *tag_files, char *tag_target)
                        (void)tcsetpgrp(STDOUT_FILENO, pager_pid);
                        kill(pager_pid, SIGCONT);
                } else
-                       pager_pid = spawn_pager(tag_files, tag_target);
+                       pager_pid = spawn_pager(outst, tag_target);
 
                /* Wait for the pager to stop or exit. */
 
@@ -1198,7 +1216,7 @@ run_pager(struct tag_files *tag_files, char *tag_target)
 }
 
 static pid_t
-spawn_pager(struct tag_files *tag_files, char *tag_target)
+spawn_pager(struct outstate *outst, char *tag_target)
 {
        const struct timespec timeout = { 0, 100000000 };  /* 0.1s */
 #define MAX_PAGER_ARGS 16
@@ -1211,14 +1229,14 @@ spawn_pager(struct tag_files *tag_files, char *tag_target)
        int              argc, use_ofn;
        pid_t            pager_pid;
 
-       assert(tag_files->ofd == -1);
-       assert(tag_files->tfs == NULL);
+       assert(outst->tag_files->ofd == -1);
+       assert(outst->tag_files->tfs == NULL);
 
        pager = getenv("MANPAGER");
        if (pager == NULL || *pager == '\0')
                pager = getenv("PAGER");
        if (pager == NULL || *pager == '\0')
-               pager = "more -s";
+               pager = BINM_PAGER;
        cp = mandoc_strdup(pager);
 
        /*
@@ -1243,11 +1261,12 @@ spawn_pager(struct tag_files *tag_files, char *tag_target)
 
        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");
-                       argv[argc++] = tag_files->tfn;
+                       argv[argc++] = outst->tag_files->tfn;
                        if (tag_target != NULL) {
                                argv[argc++] = mandoc_strdup("-t");
                                argv[argc++] = tag_target;
@@ -1256,8 +1275,14 @@ spawn_pager(struct tag_files *tag_files, char *tag_target)
                }
        }
 #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()) {
@@ -1276,7 +1301,7 @@ spawn_pager(struct tag_files *tag_files, char *tag_target)
                        exit(mandoc_msg_getrc());
                }
 #endif
-               tag_files->pager_pid = pager_pid;
+               outst->tag_files->pager_pid = pager_pid;
                return pager_pid;
        }