Make HTML tags lower case for better stylistic agreement with what

[mandoc.git] / main.c

diff --git a/main.c b/main.c
index b4d8d9343d586e0e937b730cefa1fbb609728ff0..eb056230c4c64fff51a1d13fea84de04b6d56d3d 100644 (file)
--- a/main.c
+++ b/main.c
@@ -1,7 +1,7 @@
-/*     $Id: main.c,v 1.249 2015/10/13 22:59:54 schwarze Exp $ */
+/*     $Id: main.c,v 1.265 2016/04/14 20:55:48 schwarze Exp $ */

 /*
  * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
 /*
  * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>

- * Copyright (c) 2010-2012, 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2010-2012, 2014-2016 Ingo Schwarze <schwarze@openbsd.org>

  * Copyright (c) 2010 Joerg Sonnenberger <joerg@netbsd.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * Copyright (c) 2010 Joerg Sonnenberger <joerg@netbsd.org>
  *
  * Permission to use, copy, modify, and distribute this software for any


@@ -24,7 +24,10 @@
 
 #include <assert.h>
 #include <ctype.h>
 
 #include <assert.h>
 #include <ctype.h>

+#if HAVE_ERR

 #include <err.h>
 #include <err.h>

+#endif
+#include <errno.h>

 #include <fcntl.h>
 #include <glob.h>
 #include <signal.h>
 #include <fcntl.h>
 #include <glob.h>
 #include <signal.h>


@@ -32,6 +35,7 @@
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>

+#include <time.h>

 #include <unistd.h>
 
 #include "mandoc_aux.h"
 #include <unistd.h>
 
 #include "mandoc_aux.h"


@@ -59,10 +63,6 @@ enum outmode {
        OUTMODE_ONE
 };
 
        OUTMODE_ONE
 };
 

-typedef        void            (*out_mdoc)(void *, const struct roff_man *);
-typedef        void            (*out_man)(void *, const struct roff_man *);
-typedef        void            (*out_free)(void *);
-

 enum   outt {
        OUTT_ASCII = 0, /* -Tascii */
        OUTT_LOCALE,    /* -Tlocale */
 enum   outt {
        OUTT_ASCII = 0, /* -Tascii */
        OUTT_LOCALE,    /* -Tlocale */


@@ -80,9 +80,6 @@ struct        curparse {
        enum mandoclevel  wlevel;       /* ignore messages below this */
        int               wstop;        /* stop after a file with a warning */
        enum outt         outtype;      /* which output to use */
        enum mandoclevel  wlevel;       /* ignore messages below this */
        int               wstop;        /* stop after a file with a warning */
        enum outt         outtype;      /* which output to use */

-       out_mdoc          outmdoc;      /* mdoc output ptr */
-       out_man           outman;       /* man output ptr */
-       out_free          outfree;      /* free output ptr */

        void             *outdata;      /* data for output */
        struct manoutput *outopts;      /* output options */
 };
        void             *outdata;      /* data for output */
        struct manoutput *outopts;      /* output options */
 };


@@ -108,8 +105,6 @@ static      int               toptions(struct curparse *, char *);
 static void              usage(enum argmode) __attribute__((noreturn));
 static int               woptions(struct curparse *, char *);
 
 static void              usage(enum argmode) __attribute__((noreturn));
 static int               woptions(struct curparse *, char *);
 

-extern char             *__progname;
-

 static const int sec_prios[] = {1, 4, 5, 8, 6, 3, 7, 2, 9};
 static char              help_arg[] = "help";
 static char             *help_argv[] = {help_arg, NULL};
 static const int sec_prios[] = {1, 4, 5, 8, 6, 3, 7, 2, 9};
 static char              help_arg[] = "help";
 static char             *help_argv[] = {help_arg, NULL};


@@ -123,36 +118,47 @@ main(int argc, char *argv[])
        struct curparse  curp;
        struct mansearch search;
        struct tag_files *tag_files;
        struct curparse  curp;
        struct mansearch search;
        struct tag_files *tag_files;

+       const char      *progname;

        char            *auxpaths;
        char            *defos;
        unsigned char   *uc;
        struct manpage  *res, *resp;
        char            *conf_file, *defpaths;
        char            *auxpaths;
        char            *defos;
        unsigned char   *uc;
        struct manpage  *res, *resp;
        char            *conf_file, *defpaths;

-       size_t           isec, i, sz;
+       const char      *sec;
+       size_t           i, sz;

        int              prio, best_prio;
        int              prio, best_prio;

-       char             sec;
-       enum mandoclevel rctmp;

        enum outmode     outmode;
        int              fd;
        int              show_usage;
        int              options;
        int              use_pager;
        enum outmode     outmode;
        int              fd;
        int              show_usage;
        int              options;
        int              use_pager;

+       int              status, signum;

        int              c;
        int              c;

+       pid_t            pager_pid, tc_pgid, man_pgid, pid;

 
 

-#if !HAVE_PROGNAME
+#if HAVE_PROGNAME
+       progname = getprogname();
+#else

        if (argc < 1)
        if (argc < 1)

-               __progname = mandoc_strdup("mandoc");
-       else if ((__progname = strrchr(argv[0], '/')) == NULL)
-               __progname = argv[0];
+               progname = mandoc_strdup("mandoc");
+       else if ((progname = strrchr(argv[0], '/')) == NULL)
+               progname = argv[0];

        else
        else

-               ++__progname;
+               ++progname;
+       setprogname(progname);

 #endif
 
 #if HAVE_SQLITE3
 #endif
 
 #if HAVE_SQLITE3

-       if (strcmp(__progname, BINM_MAKEWHATIS) == 0)
+       if (strncmp(progname, "mandocdb", 8) == 0 ||
+           strcmp(progname, BINM_MAKEWHATIS) == 0)

                return mandocdb(argc, argv);
 #endif
 
                return mandocdb(argc, argv);
 #endif
 

+#if HAVE_PLEDGE
+       if (pledge("stdio rpath tmppath tty proc exec flock", NULL) == -1)
+               err((int)MANDOCLEVEL_SYSERR, "pledge");
+#endif
+

        /* Search options. */
 
        memset(&conf, 0, sizeof(conf));
        /* Search options. */
 
        memset(&conf, 0, sizeof(conf));


@@ -162,13 +168,13 @@ main(int argc, char *argv[])
        memset(&search, 0, sizeof(struct mansearch));
        search.outkey = "Nd";
 
        memset(&search, 0, sizeof(struct mansearch));
        search.outkey = "Nd";
 

-       if (strcmp(__progname, BINM_MAN) == 0)
+       if (strcmp(progname, BINM_MAN) == 0)

                search.argmode = ARG_NAME;
                search.argmode = ARG_NAME;

-       else if (strcmp(__progname, BINM_APROPOS) == 0)
+       else if (strcmp(progname, BINM_APROPOS) == 0)

                search.argmode = ARG_EXPR;
                search.argmode = ARG_EXPR;

-       else if (strcmp(__progname, BINM_WHATIS) == 0)
+       else if (strcmp(progname, BINM_WHATIS) == 0)

                search.argmode = ARG_WORD;
                search.argmode = ARG_WORD;

-       else if (strncmp(__progname, "help", 4) == 0)
+       else if (strncmp(progname, "help", 4) == 0)

                search.argmode = ARG_NAME;
        else
                search.argmode = ARG_FILE;
                search.argmode = ARG_NAME;
        else
                search.argmode = ARG_FILE;


@@ -292,6 +298,12 @@ main(int argc, char *argv[])
            !isatty(STDOUT_FILENO))
                use_pager = 0;
 
            !isatty(STDOUT_FILENO))
                use_pager = 0;
 

+#if HAVE_PLEDGE
+       if (!use_pager)
+               if (pledge("stdio rpath flock", NULL) == -1)
+                       err((int)MANDOCLEVEL_SYSERR, "pledge");
+#endif
+

        /* Parse arguments. */
 
        if (argc > 0) {
        /* Parse arguments. */
 
        if (argc > 0) {


@@ -306,7 +318,7 @@ main(int argc, char *argv[])
         */
 
        if (search.argmode == ARG_NAME) {
         */
 
        if (search.argmode == ARG_NAME) {

-               if (*__progname == 'h') {
+               if (*progname == 'h') {

                        if (argc == 0) {
                                argv = help_argv;
                                argc = 1;
                        if (argc == 0) {
                                argv = help_argv;
                                argc = 1;


@@ -378,7 +390,7 @@ main(int argc, char *argv[])
 
                if (outmode == OUTMODE_ONE) {
                        argc = 1;
 
                if (outmode == OUTMODE_ONE) {
                        argc = 1;

-                       best_prio = 10;
+                       best_prio = 20;

                } else if (outmode == OUTMODE_ALL)
                        argc = (int)sz;
 
                } else if (outmode == OUTMODE_ALL)
                        argc = (int)sz;
 


@@ -394,11 +406,13 @@ main(int argc, char *argv[])
                                    res[i].output);
                        else if (outmode == OUTMODE_ONE) {
                                /* Search for the best section. */
                                    res[i].output);
                        else if (outmode == OUTMODE_ONE) {
                                /* Search for the best section. */

-                               isec = strcspn(res[i].file, "123456789");
-                               sec = res[i].file[isec];
-                               if ('\0' == sec)
+                               sec = res[i].file;
+                               sec += strcspn(sec, "123456789");
+                               if (sec[0] == '\0')

                                        continue;
                                        continue;

-                               prio = sec_prios[sec - '1'];
+                               prio = sec_prios[sec[0] - '1'];
+                               if (sec[1] != '/')
+                                       prio += 10;

                                if (prio >= best_prio)
                                        continue;
                                best_prio = prio;
                                if (prio >= best_prio)
                                        continue;
                                best_prio = prio;


@@ -418,6 +432,16 @@ main(int argc, char *argv[])
 
        /* mandoc(1) */
 
 
        /* mandoc(1) */
 

+#if HAVE_PLEDGE
+       if (use_pager) {
+               if (pledge("stdio rpath tmppath tty proc exec", NULL) == -1)
+                       err((int)MANDOCLEVEL_SYSERR, "pledge");
+       } else {
+               if (pledge("stdio rpath", NULL) == -1)
+                       err((int)MANDOCLEVEL_SYSERR, "pledge");
+       }
+#endif
+

        if (search.argmode == ARG_FILE && ! moptions(&options, auxpaths))
                return (int)MANDOCLEVEL_BADARG;
 
        if (search.argmode == ARG_FILE && ! moptions(&options, auxpaths))
                return (int)MANDOCLEVEL_BADARG;
 


@@ -437,11 +461,7 @@ main(int argc, char *argv[])
        }
 
        while (argc > 0) {
        }
 
        while (argc > 0) {

-               rctmp = mparse_open(curp.mp, &fd,
-                   resp != NULL ? resp->file : *argv);
-               if (rc < rctmp)
-                       rc = rctmp;
-
+               fd = mparse_open(curp.mp, resp != NULL ? resp->file : *argv);

                if (fd != -1) {
                        if (use_pager) {
                                tag_files = tag_init();
                if (fd != -1) {
                        if (use_pager) {
                                tag_files = tag_init();


@@ -460,7 +480,8 @@ main(int argc, char *argv[])
 
                        if (argc > 1 && curp.outtype <= OUTT_UTF8)
                                ascii_sepline(curp.outdata);
 
                        if (argc > 1 && curp.outtype <= OUTT_UTF8)
                                ascii_sepline(curp.outdata);

-               }
+               } else if (rc < MANDOCLEVEL_ERROR)
+                       rc = MANDOCLEVEL_ERROR;

 
                if (MANDOCLEVEL_OK != rc && curp.wstop)
                        break;
 
                if (MANDOCLEVEL_OK != rc && curp.wstop)
                        break;


@@ -473,8 +494,24 @@ main(int argc, char *argv[])
                        mparse_reset(curp.mp);
        }
 
                        mparse_reset(curp.mp);
        }
 

-       if (curp.outfree)
-               (*curp.outfree)(curp.outdata);
+       if (curp.outdata != NULL) {
+               switch (curp.outtype) {
+               case OUTT_HTML:
+                       html_free(curp.outdata);
+                       break;
+               case OUTT_UTF8:
+               case OUTT_LOCALE:
+               case OUTT_ASCII:
+                       ascii_free(curp.outdata);
+                       break;
+               case OUTT_PDF:
+               case OUTT_PS:
+                       pspdf_free(curp.outdata);
+                       break;
+               default:
+                       break;
+               }
+       }

        mparse_free(curp.mp);
        mchars_free();
 
        mparse_free(curp.mp);
        mchars_free();
 


@@ -497,7 +534,52 @@ out:
        if (tag_files != NULL) {
                fclose(stdout);
                tag_write();
        if (tag_files != NULL) {
                fclose(stdout);
                tag_write();

-               waitpid(spawn_pager(tag_files), NULL, 0);
+               man_pgid = getpgid(0);
+               tag_files->tcpgid = man_pgid == getpid() ?
+                   getpgid(getppid()) : man_pgid;
+               pager_pid = 0;
+               signum = SIGSTOP;
+               for (;;) {
+
+                       /* Stop here until moved to the foreground. */
+
+                       tc_pgid = tcgetpgrp(STDIN_FILENO);
+                       if (tc_pgid != man_pgid) {
+                               if (tc_pgid == pager_pid) {
+                                       (void)tcsetpgrp(STDIN_FILENO,
+                                           man_pgid);
+                                       if (signum == SIGTTIN)
+                                               continue;
+                               } else
+                                       tag_files->tcpgid = tc_pgid;
+                               kill(0, signum);
+                               continue;
+                       }
+
+                       /* Once in the foreground, activate the pager. */
+
+                       if (pager_pid) {
+                               (void)tcsetpgrp(STDIN_FILENO, pager_pid);
+                               kill(pager_pid, SIGCONT);
+                       } else
+                               pager_pid = spawn_pager(tag_files);
+
+                       /* Wait for the pager to stop or exit. */
+
+                       while ((pid = waitpid(pager_pid, &status,
+                           WUNTRACED)) == -1 && errno == EINTR)
+                               continue;
+
+                       if (pid == -1) {
+                               warn("wait");
+                               rc = MANDOCLEVEL_SYSERR;
+                               break;
+                       }
+                       if (!WIFSTOPPED(status))
+                               break;
+
+                       signum = WSTOPSIG(status);
+               }

                tag_unlink();
        }
 
                tag_unlink();
        }
 


@@ -582,7 +664,7 @@ fs_lookup(const struct manpaths *paths, size_t ipath,
 
 found:
 #if HAVE_SQLITE3
 
 found:
 #if HAVE_SQLITE3

-       warnx("outdated mandoc.db lacks %s(%s) entry, run makewhatis %s\n",
+       warnx("outdated mandoc.db lacks %s(%s) entry, run makewhatis %s",

            name, sec, paths->paths[ipath]);
 #endif
        *res = mandoc_reallocarray(*res, ++*ressz, sizeof(struct manpage));
            name, sec, paths->paths[ipath]);
 #endif
        *res = mandoc_reallocarray(*res, ++*ressz, sizeof(struct manpage));


@@ -602,7 +684,7 @@ fs_search(const struct mansearch *cfg, const struct manpaths *paths,
        int argc, char **argv, struct manpage **res, size_t *ressz)
 {
        const char *const sections[] =
        int argc, char **argv, struct manpage **res, size_t *ressz)
 {
        const char *const sections[] =

-           {"1", "8", "6", "2", "3", "3p", "5", "7", "4", "9"};
+           {"1", "8", "6", "2", "3", "5", "7", "4", "9", "3p"};

        const size_t nsec = sizeof(sections)/sizeof(sections[0]);
 
        size_t           ipath, isec, lastsz;
        const size_t nsec = sizeof(sections)/sizeof(sections[0]);
 
        size_t           ipath, isec, lastsz;


@@ -641,9 +723,11 @@ parse(struct curparse *curp, int fd, const char *file)
        /* Begin by parsing the file itself. */
 
        assert(file);
        /* Begin by parsing the file itself. */
 
        assert(file);

-       assert(fd >= -1);
+       assert(fd >= 0);

 
        rctmp = mparse_readfd(curp->mp, fd, file);
 
        rctmp = mparse_readfd(curp->mp, fd, file);

+       if (fd != STDIN_FILENO)
+               close(fd);

        if (rc < rctmp)
                rc = rctmp;
 
        if (rc < rctmp)
                rc = rctmp;
 


@@ -657,72 +741,83 @@ parse(struct curparse *curp, int fd, const char *file)
 
        /* If unset, allocate output dev now (if applicable). */
 
 
        /* If unset, allocate output dev now (if applicable). */
 

-       if ( ! (curp->outman && curp->outmdoc)) {
+       if (curp->outdata == NULL) {

                switch (curp->outtype) {
                case OUTT_HTML:
                        curp->outdata = html_alloc(curp->outopts);
                switch (curp->outtype) {
                case OUTT_HTML:
                        curp->outdata = html_alloc(curp->outopts);

-                       curp->outfree = html_free;

                        break;
                case OUTT_UTF8:
                        curp->outdata = utf8_alloc(curp->outopts);
                        break;
                case OUTT_UTF8:
                        curp->outdata = utf8_alloc(curp->outopts);

-                       curp->outfree = ascii_free;

                        break;
                case OUTT_LOCALE:
                        curp->outdata = locale_alloc(curp->outopts);
                        break;
                case OUTT_LOCALE:
                        curp->outdata = locale_alloc(curp->outopts);

-                       curp->outfree = ascii_free;

                        break;
                case OUTT_ASCII:
                        curp->outdata = ascii_alloc(curp->outopts);
                        break;
                case OUTT_ASCII:
                        curp->outdata = ascii_alloc(curp->outopts);

-                       curp->outfree = ascii_free;

                        break;
                case OUTT_PDF:
                        curp->outdata = pdf_alloc(curp->outopts);
                        break;
                case OUTT_PDF:
                        curp->outdata = pdf_alloc(curp->outopts);

-                       curp->outfree = pspdf_free;

                        break;
                case OUTT_PS:
                        curp->outdata = ps_alloc(curp->outopts);
                        break;
                case OUTT_PS:
                        curp->outdata = ps_alloc(curp->outopts);

-                       curp->outfree = pspdf_free;

                        break;
                default:
                        break;
                }
                        break;
                default:
                        break;
                }

+       }
+
+       mparse_result(curp->mp, &man, NULL);
+
+       /* Execute the out device, if it exists. */

 
 

+       if (man == NULL)
+               return;
+       if (man->macroset == MACROSET_MDOC) {
+               mdoc_validate(man);

                switch (curp->outtype) {
                case OUTT_HTML:
                switch (curp->outtype) {
                case OUTT_HTML:

-                       curp->outman = html_man;
-                       curp->outmdoc = html_mdoc;
+                       html_mdoc(curp->outdata, man);

                        break;
                case OUTT_TREE:
                        break;
                case OUTT_TREE:

-                       curp->outman = tree_man;
-                       curp->outmdoc = tree_mdoc;
+                       tree_mdoc(curp->outdata, man);

                        break;
                case OUTT_MAN:
                        break;
                case OUTT_MAN:

-                       curp->outmdoc = man_mdoc;
-                       curp->outman = man_man;
+                       man_mdoc(curp->outdata, man);

                        break;
                case OUTT_PDF:
                case OUTT_ASCII:
                case OUTT_UTF8:
                case OUTT_LOCALE:
                case OUTT_PS:
                        break;
                case OUTT_PDF:
                case OUTT_ASCII:
                case OUTT_UTF8:
                case OUTT_LOCALE:
                case OUTT_PS:

-                       curp->outman = terminal_man;
-                       curp->outmdoc = terminal_mdoc;
+                       terminal_mdoc(curp->outdata, man);
+                       break;
+               default:
+                       break;
+               }
+       }
+       if (man->macroset == MACROSET_MAN) {
+               man_validate(man);
+               switch (curp->outtype) {
+               case OUTT_HTML:
+                       html_man(curp->outdata, man);
+                       break;
+               case OUTT_TREE:
+                       tree_man(curp->outdata, man);
+                       break;
+               case OUTT_MAN:
+                       man_man(curp->outdata, man);
+                       break;
+               case OUTT_PDF:
+               case OUTT_ASCII:
+               case OUTT_UTF8:
+               case OUTT_LOCALE:
+               case OUTT_PS:
+                       terminal_man(curp->outdata, man);

                        break;
                default:
                        break;
                }
        }
                        break;
                default:
                        break;
                }
        }

-
-       mparse_result(curp->mp, &man, NULL);
-
-       /* Execute the out device, if it exists. */
-
-       if (man == NULL)
-               return;
-       if (curp->outmdoc != NULL && man->macroset == MACROSET_MDOC)
-               (*curp->outmdoc)(curp->outdata, man);
-       if (curp->outman != NULL && man->macroset == MACROSET_MAN)
-               (*curp->outman)(curp->outdata, man);

 }
 
 static void
 }
 
 static void


@@ -733,12 +828,12 @@ passthrough(const char *file, int fd, int synopsis_only)
 
        FILE            *stream;
        const char      *syscall;
 
        FILE            *stream;
        const char      *syscall;

-       char            *line;
-       size_t           len, off;
-       ssize_t          nw;
+       char            *line, *cp;
+       size_t           linesz;

        int              print;
 
        int              print;
 

-       fflush(stdout);
+       line = NULL;
+       linesz = 0;

 
        if ((stream = fdopen(fd, "r")) == NULL) {
                close(fd);
 
        if ((stream = fdopen(fd, "r")) == NULL) {
                close(fd);


@@ -747,45 +842,41 @@ passthrough(const char *file, int fd, int synopsis_only)
        }
 
        print = 0;
        }
 
        print = 0;

-       while ((line = fgetln(stream, &len)) != NULL) {
+       while (getline(&line, &linesz, stream) != -1) {
+               cp = line;

                if (synopsis_only) {
                        if (print) {
                if (synopsis_only) {
                        if (print) {

-                               if ( ! isspace((unsigned char)*line))
+                               if ( ! isspace((unsigned char)*cp))

                                        goto done;
                                        goto done;

-                               while (len &&
-                                   isspace((unsigned char)*line)) {
-                                       line++;
-                                       len--;
-                               }
+                               while (isspace((unsigned char)*cp))
+                                       cp++;

                        } else {
                        } else {

-                               if ((len == sizeof(synb) &&
-                                    ! strncmp(line, synb, len - 1)) ||
-                                   (len == sizeof(synr) &&
-                                    ! strncmp(line, synr, len - 1)))
+                               if (strcmp(cp, synb) == 0 ||
+                                   strcmp(cp, synr) == 0)

                                        print = 1;
                                continue;
                        }
                }
                                        print = 1;
                                continue;
                        }
                }

-               for (off = 0; off < len; off += nw)
-                       if ((nw = write(STDOUT_FILENO, line + off,
-                           len - off)) == -1 || nw == 0) {
-                               fclose(stream);
-                               syscall = "write";
-                               goto fail;
-                       }
+               if (fputs(cp, stdout)) {
+                       fclose(stream);
+                       syscall = "fputs";
+                       goto fail;
+               }

        }
 
        if (ferror(stream)) {
                fclose(stream);
        }
 
        if (ferror(stream)) {
                fclose(stream);

-               syscall = "fgetln";
+               syscall = "getline";

                goto fail;
        }
 
 done:
                goto fail;
        }
 
 done:

+       free(line);

        fclose(stream);
        return;
 
 fail:
        fclose(stream);
        return;
 
 fail:

+       free(line);

        warn("%s: SYSERR: %s", file, syscall);
        if (rc < MANDOCLEVEL_SYSERR)
                rc = MANDOCLEVEL_SYSERR;
        warn("%s: SYSERR: %s", file, syscall);
        if (rc < MANDOCLEVEL_SYSERR)
                rc = MANDOCLEVEL_SYSERR;


@@ -911,7 +1002,7 @@ mmsg(enum mandocerr t, enum mandoclevel lvl,
 {
        const char      *mparse_msg;
 
 {
        const char      *mparse_msg;
 

-       fprintf(stderr, "%s: %s:", __progname, file);
+       fprintf(stderr, "%s: %s:", getprogname(), file);

 
        if (line)
                fprintf(stderr, "%d:%d:", line, col + 1);
 
        if (line)
                fprintf(stderr, "%d:%d:", line, col + 1);


@@ -930,6 +1021,7 @@ mmsg(enum mandocerr t, enum mandoclevel lvl,
 static pid_t
 spawn_pager(struct tag_files *tag_files)
 {
 static pid_t
 spawn_pager(struct tag_files *tag_files)
 {

+       const struct timespec timeout = { 0, 100000000 };  /* 0.1s */

 #define MAX_PAGER_ARGS 16
        char            *argv[MAX_PAGER_ARGS];
        const char      *pager;
 #define MAX_PAGER_ARGS 16
        char            *argv[MAX_PAGER_ARGS];
        const char      *pager;


@@ -981,6 +1073,13 @@ spawn_pager(struct tag_files *tag_files)
        case 0:
                break;
        default:
        case 0:
                break;
        default:

+               (void)setpgid(pager_pid, 0);
+               (void)tcsetpgrp(STDIN_FILENO, pager_pid);
+#if HAVE_PLEDGE
+               if (pledge("stdio rpath tmppath tty proc", NULL) == -1)
+                       err((int)MANDOCLEVEL_SYSERR, "pledge");
+#endif
+               tag_files->pager_pid = pager_pid;

                return pager_pid;
        }
 
                return pager_pid;
        }
 


@@ -990,6 +1089,12 @@ spawn_pager(struct tag_files *tag_files)
                err((int)MANDOCLEVEL_SYSERR, "pager stdout");
        close(tag_files->ofd);
        close(tag_files->tfd);
                err((int)MANDOCLEVEL_SYSERR, "pager stdout");
        close(tag_files->ofd);
        close(tag_files->tfd);

+
+       /* Do not start the pager before controlling the terminal. */
+
+       while (tcgetpgrp(STDIN_FILENO) != getpid())
+               nanosleep(&timeout, NULL);
+

        execvp(argv[0], argv);
        err((int)MANDOCLEVEL_SYSERR, "exec %s", argv[0]);
 }
        execvp(argv[0], argv);
        err((int)MANDOCLEVEL_SYSERR, "exec %s", argv[0]);
 }