old groff_char(7) reported by kamil at NetBSD

[mandoc.git] / main.c

diff --git a/main.c b/main.c
index cafbeb9f0b9e37eb0374c7f715cb6c32c08f81a5..161cb864c964eb70c333632bd00a4dd271b8f308 100644 (file)
--- a/main.c
+++ b/main.c
@@ -1,4 +1,4 @@
-/* $Id: main.c,v 1.350 2020/06/15 17:25:42 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>
@@ -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,7 +648,9 @@ out:
                manconf_free(&conf);
 
        if (outst.tag_files != NULL) {
-               if (term_tag_close() != -1)
+               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)
@@ -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)
@@ -1218,7 +1236,7 @@ spawn_pager(struct outstate *outst, char *tag_target)
        if (pager == NULL || *pager == '\0')
                pager = getenv("PAGER");
        if (pager == NULL || *pager == '\0')
-               pager = "more -s";
+               pager = BINM_PAGER;
        cp = mandoc_strdup(pager);
 
        /*