better error message if mandocd is not found

[mandoc.git] / main.c

diff --git a/main.c b/main.c
index 7f5437e2fb0bf0f37b28efe70edf01483b7099e7..9f878ff5200ef250977c4fb07ece283293218e91 100644 (file)
--- a/main.c
+++ b/main.c
@@ -1,7 +1,7 @@
-/*     $Id: main.c,v 1.335 2019/07/26 23:12:15 schwarze Exp $ */
+/* $Id: main.c,v 1.360 2021/10/04 21:29:17 schwarze Exp $ */

 /*
 /*

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

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

- * Copyright (c) 2010-2012, 2014-2019 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


@@ -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.
  * 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"
 
  */
 #include "config.h"
 


@@ -32,6 +34,7 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <glob.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <glob.h>

+#include <limits.h>

 #if HAVE_SANDBOX_INIT
 #include <sandbox.h>
 #endif
 #if HAVE_SANDBOX_INIT
 #include <sandbox.h>
 #endif


@@ -52,6 +55,7 @@
 #include "man.h"
 #include "mandoc_parse.h"
 #include "tag.h"
 #include "man.h"
 #include "mandoc_parse.h"
 #include "tag.h"

+#include "term_tag.h"

 #include "main.h"
 #include "manconf.h"
 #include "mansearch.h"
 #include "main.h"
 #include "manconf.h"
 #include "mansearch.h"


@@ -78,28 +82,36 @@ enum        outt {
 };
 
 struct outstate {
 };
 
 struct outstate {

+       struct tag_files *tag_files;    /* Tagging state variables. */

        void             *outdata;      /* data for output */
        void             *outdata;      /* data for output */

+       int               use_pager;

        int               wstop;        /* stop after a file with a warning */
        int               wstop;        /* stop after a file with a warning */

+       int               had_output;   /* Some output was generated. */

        enum outt         outtype;      /* which output to use */
 };
 
 
 int                      mandocdb(int, char *[]);
 
        enum outt         outtype;      /* which output to use */
 };
 
 
 int                      mandocdb(int, char *[]);
 

-static void              check_xr(void);
-static int               fs_lookup(const struct manpaths *,
-                               size_t ipath, const char *,
-                               const char *, const char *,
+static void              check_xr(struct manpaths *);
+static void              fs_append(char **, size_t, int,
+                               size_t, const char *, enum form,
+                               struct manpage **, size_t *);
+static int               fs_lookup(const struct manpaths *, size_t,
+                               const char *, const char *, const char *,

                                struct manpage **, size_t *);
 static int               fs_search(const struct mansearch *,
                                struct manpage **, size_t *);
 static int               fs_search(const struct mansearch *,

-                               const struct manpaths *, int, char**,
+                               const struct manpaths *, const char *,

                                struct manpage **, size_t *);
                                struct manpage **, size_t *);

+static void              glob_esc(char **, const char *, const char *);

 static void              outdata_alloc(struct outstate *, struct manoutput *);
 static void              parse(struct mparse *, int, const char *,
 static void              outdata_alloc(struct outstate *, struct manoutput *);
 static void              parse(struct mparse *, int, const char *,

-                               struct outstate *, struct manoutput *);
+                               struct outstate *, struct manconf *);

 static void              passthrough(int, int);
 static void              passthrough(int, int);

-static void              run_pager(struct tag_files *);
-static pid_t             spawn_pager(struct tag_files *);
+static void              process_onefile(struct mparse *, struct manpage *,
+                               int, struct outstate *, struct manconf *);
+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 *);
 


@@ -115,24 +127,24 @@ main(int argc, char *argv[])
        struct outstate  outst;         /* Output state. */
        struct winsize   ws;            /* Result of ioctl(TIOCGWINSZ). */
        struct mansearch search;        /* Search options. */
        struct outstate  outst;         /* Output state. */
        struct winsize   ws;            /* Result of ioctl(TIOCGWINSZ). */
        struct mansearch search;        /* Search options. */

-       struct manpage  *res, *resp;    /* Search results. */
+       struct manpage  *res;           /* Complete list of search results. */
+       struct manpage  *resn;          /* Search results for one name. */

        struct mparse   *mp;            /* Opaque parser object. */
        struct mparse   *mp;            /* Opaque parser object. */

-       struct tag_files *tag_files;    /* Tagging state variables. */

        const char      *conf_file;     /* -C: alternate config file. */
        const char      *os_s;          /* -I: Operating system for display. */
        const char      *conf_file;     /* -C: alternate config file. */
        const char      *os_s;          /* -I: Operating system for display. */

-       const char      *progname, *sec, *thisarg;
+       const char      *progname, *sec, *ep;

        char            *defpaths;      /* -M: override manpaths. */
        char            *auxpaths;      /* -m: additional manpaths. */
        char            *oarg;          /* -O: output option string. */
        char            *tagarg;        /* -O tag: default value. */
        unsigned char   *uc;
        char            *defpaths;      /* -M: override manpaths. */
        char            *auxpaths;      /* -m: additional manpaths. */
        char            *oarg;          /* -O: output option string. */
        char            *tagarg;        /* -O tag: default value. */
        unsigned char   *uc;

-       size_t           sz;            /* Number of elements in res[]. */
-       size_t           i, ssz;
+       size_t           ressz;         /* Number of elements in res[]. */
+       size_t           resnsz;        /* Number of elements in resn[]. */
+       size_t           i, ib, ssz;

        int              options;       /* Parser options. */
        int              show_usage;    /* Invalid argument: give up. */
        int              options;       /* Parser options. */
        int              show_usage;    /* Invalid argument: give up. */

-       int              use_pager;     /* According to command line. */

        int              prio, best_prio;
        int              prio, best_prio;

-       int              fd, startdir;
+       int              startdir;

        int              c;
        enum mandoc_os   os_e;          /* Check base system conventions. */
        enum outmode     outmode;       /* According to command line. */
        int              c;
        enum mandoc_os   os_e;          /* Check base system conventions. */
        enum outmode     outmode;       /* According to command line. */


@@ -155,7 +167,7 @@ main(int argc, char *argv[])
                return mandocdb(argc, argv);
 
 #if HAVE_PLEDGE
                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();
        }
                mandoc_msg(MANDOCERR_PLEDGE, 0, 0, "%s", strerror(errno));
                return mandoc_msg_getrc();
        }


@@ -195,10 +207,10 @@ main(int argc, char *argv[])
        /* Formatter options. */
 
        memset(&outst, 0, sizeof(outst));
        /* Formatter options. */
 
        memset(&outst, 0, sizeof(outst));

+       outst.tag_files = NULL;

        outst.outtype = OUTT_LOCALE;
        outst.outtype = OUTT_LOCALE;

+       outst.use_pager = 1;

 
 

-       use_pager = 1;
-       tag_files = NULL;

        show_usage = 0;
        outmode = OUTMODE_DEF;
 
        show_usage = 0;
        outmode = OUTMODE_DEF;
 


@@ -216,14 +228,14 @@ main(int argc, char *argv[])
                        conf_file = optarg;
                        break;
                case 'c':
                        conf_file = optarg;
                        break;
                case 'c':

-                       use_pager = 0;
+                       outst.use_pager = 0;

                        break;
                case 'f':
                        search.argmode = ARG_WORD;
                        break;
                case 'h':
                        conf.output.synopsisonly = 1;
                        break;
                case 'f':
                        search.argmode = ARG_WORD;
                        break;
                case 'h':
                        conf.output.synopsisonly = 1;

-                       use_pager = 0;
+                       outst.use_pager = 0;

                        outmode = OUTMODE_ALL;
                        break;
                case 'I':
                        outmode = OUTMODE_ALL;
                        break;
                case 'I':


@@ -320,11 +332,12 @@ main(int argc, char *argv[])
 
        /* Postprocess options. */
 
 
        /* Postprocess options. */
 

-       if (outmode == OUTMODE_DEF) {
+       switch (outmode) {
+       case OUTMODE_DEF:

                switch (search.argmode) {
                case ARG_FILE:
                        outmode = OUTMODE_ALL;
                switch (search.argmode) {
                case ARG_FILE:
                        outmode = OUTMODE_ALL;

-                       use_pager = 0;
+                       outst.use_pager = 0;

                        break;
                case ARG_NAME:
                        outmode = OUTMODE_ONE;
                        break;
                case ARG_NAME:
                        outmode = OUTMODE_ONE;


@@ -333,6 +346,16 @@ main(int argc, char *argv[])
                        outmode = OUTMODE_LST;
                        break;
                }
                        outmode = OUTMODE_LST;
                        break;
                }

+               break;
+       case OUTMODE_FLN:
+               if (search.argmode == ARG_FILE)
+                       outmode = OUTMODE_ALL;
+               break;
+       case OUTMODE_ALL:
+               break;
+       case OUTMODE_LST:
+       case OUTMODE_ONE:
+               abort();

        }
 
        if (oarg != NULL) {
        }
 
        if (oarg != NULL) {


@@ -352,10 +375,12 @@ main(int argc, char *argv[])
 
        if (outmode == OUTMODE_FLN ||
            outmode == OUTMODE_LST ||
 
        if (outmode == OUTMODE_FLN ||
            outmode == OUTMODE_LST ||

-           !isatty(STDOUT_FILENO))
-               use_pager = 0;
+           (conf.output.outfilename == NULL &&
+            conf.output.tagfilename == NULL &&
+            isatty(STDOUT_FILENO) == 0))
+               outst.use_pager = 0;

 
 

-       if (use_pager &&
+       if (outst.use_pager &&

            (conf.output.width == 0 || conf.output.indent == 0) &&
            ioctl(STDOUT_FILENO, TIOCGWINSZ, &ws) != -1 &&
            ws.ws_col > 1) {
            (conf.output.width == 0 || conf.output.indent == 0) &&
            ioctl(STDOUT_FILENO, TIOCGWINSZ, &ws) != -1 &&
            ws.ws_col > 1) {


@@ -366,12 +391,16 @@ main(int argc, char *argv[])
        }
 
 #if HAVE_PLEDGE
        }
 
 #if HAVE_PLEDGE

-       if (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
 
        }
 #endif
 


@@ -381,11 +410,10 @@ main(int argc, char *argv[])
                argc -= optind;
                argv += optind;
        }
                argc -= optind;
                argv += optind;
        }

-       resp = NULL;

 
        /*
 
        /*

-        * Quirks for help(1)
-        * and for a man(1) section argument without -s.
+        * Quirks for help(1) and man(1),
+        * in particular for a section argument without -s.

         */
 
        if (search.argmode == ARG_NAME) {
         */
 
        if (search.argmode == ARG_NAME) {


@@ -409,6 +437,8 @@ main(int argc, char *argv[])
                if (search.arch == NULL)
                        search.arch = MACHINE;
 #endif
                if (search.arch == NULL)
                        search.arch = MACHINE;
 #endif

+               if (outmode == OUTMODE_ONE)
+                       search.firstmatch = 1;

        }
 
        /*
        }
 
        /*


@@ -422,80 +452,81 @@ main(int argc, char *argv[])
                conf.output.tag = tagarg == NULL ? *argv : tagarg + 1;
        }
 
                conf.output.tag = tagarg == NULL ? *argv : tagarg + 1;
        }
 

-       /* man(1), whatis(1), apropos(1) */
-
-       if (search.argmode != ARG_FILE) {
-               if (search.argmode == ARG_NAME &&
-                   outmode == OUTMODE_ONE)
-                       search.firstmatch = 1;
-
-               /* Access the mandoc database. */
+       /* Read the configuration file. */

 
 

+       if (search.argmode != ARG_FILE ||
+           mandoc_msg_getmin() == MANDOCERR_STYLE)

                manconf_parse(&conf, conf_file, defpaths, auxpaths);
                manconf_parse(&conf, conf_file, defpaths, auxpaths);

-               if ( ! mansearch(&search, &conf.manpath,
-                   argc, argv, &res, &sz))
-                       usage(search.argmode);

 
 

-               if (sz == 0 && search.argmode == ARG_NAME)
-                       (void)fs_search(&search, &conf.manpath,
-                           argc, argv, &res, &sz);
+       /* man(1): Resolve each name individually. */

 
 

-               if (search.argmode == ARG_NAME) {
-                       for (c = 0; c < argc; c++) {
-                               if (strchr(argv[c], '/') == NULL)
-                                       continue;
-                               if (access(argv[c], R_OK) == -1) {
-                                       mandoc_msg_setinfilename(argv[c]);
+       if (search.argmode == ARG_NAME) {
+               if (argc < 1) {
+                       if (outmode != OUTMODE_FLN)
+                               usage(ARG_NAME);
+                       if (conf.manpath.sz == 0) {
+                               warnx("The manpath is empty.");
+                               mandoc_msg_setrc(MANDOCLEVEL_BADARG);
+                       } else {
+                               for (i = 0; i + 1 < conf.manpath.sz; i++)
+                                       printf("%s:", conf.manpath.paths[i]);
+                               printf("%s\n", conf.manpath.paths[i]);
+                       }
+                       manconf_free(&conf);
+                       return (int)mandoc_msg_getrc();
+               }
+               for (res = NULL, ressz = 0; argc > 0; argc--, argv++) {
+                       (void)mansearch(&search, &conf.manpath,
+                           1, argv, &resn, &resnsz);
+                       if (resnsz == 0)
+                               (void)fs_search(&search, &conf.manpath,
+                                   *argv, &resn, &resnsz);
+                       if (resnsz == 0 && strchr(*argv, '/') == NULL) {
+                               if (search.arch != NULL &&
+                                   arch_valid(search.arch, OSENUM) == 0)
+                                       warnx("Unknown architecture \"%s\".",
+                                           search.arch);
+                               else if (search.sec != NULL)
+                                       warnx("No entry for %s in "
+                                           "section %s of the manual.",
+                                           *argv, search.sec);
+                               else
+                                       warnx("No entry for %s in "
+                                           "the manual.", *argv);
+                               mandoc_msg_setrc(MANDOCLEVEL_BADARG);
+                               continue;
+                       }
+                       if (resnsz == 0) {
+                               if (access(*argv, R_OK) == -1) {
+                                       mandoc_msg_setinfilename(*argv);

                                        mandoc_msg(MANDOCERR_BADARG_BAD,
                                            0, 0, "%s", strerror(errno));
                                        mandoc_msg_setinfilename(NULL);
                                        continue;
                                }
                                        mandoc_msg(MANDOCERR_BADARG_BAD,
                                            0, 0, "%s", strerror(errno));
                                        mandoc_msg_setinfilename(NULL);
                                        continue;
                                }

+                               resnsz = 1;
+                               resn = mandoc_calloc(resnsz, sizeof(*res));
+                               resn->file = mandoc_strdup(*argv);
+                               resn->ipath = SIZE_MAX;
+                               resn->form = FORM_SRC;
+                       }
+                       if (outmode != OUTMODE_ONE || resnsz == 1) {

                                res = mandoc_reallocarray(res,
                                res = mandoc_reallocarray(res,

-                                   sz + 1, sizeof(*res));
-                               res[sz].file = mandoc_strdup(argv[c]);
-                               res[sz].names = NULL;
-                               res[sz].output = NULL;
-                               res[sz].bits = 0;
-                               res[sz].ipath = SIZE_MAX;
-                               res[sz].sec = 10;
-                               res[sz].form = FORM_SRC;
-                               sz++;
+                                   ressz + resnsz, sizeof(*res));
+                               memcpy(res + ressz, resn,
+                                   sizeof(*resn) * resnsz);
+                               ressz += resnsz;
+                               free(resn);
+                               resn = NULL;
+                               resnsz = 0;
+                               continue;

                        }
                        }

-               }

 
 

-               if (sz == 0) {
-                       if (search.argmode != ARG_NAME)
-                               warnx("nothing appropriate");
-                       mandoc_msg_setrc(MANDOCLEVEL_BADARG);
-                       goto out;
-               }
+                       /* Search for the best section. */

 
 

-               /*
-                * For standard man(1) and -a output mode,
-                * prepare for copying filename pointers
-                * into the program parameter array.
-                */
-
-               if (outmode == OUTMODE_ONE) {
-                       argc = 1;

                        best_prio = 40;
                        best_prio = 40;

-               } else if (outmode == OUTMODE_ALL)
-                       argc = (int)sz;
-
-               /* Iterate all matching manuals. */
-
-               resp = res;
-               for (i = 0; i < sz; i++) {
-                       if (outmode == OUTMODE_FLN)
-                               puts(res[i].file);
-                       else if (outmode == OUTMODE_LST)
-                               printf("%s - %s\n", res[i].names,
-                                   res[i].output == NULL ? "" :
-                                   res[i].output);
-                       else if (outmode == OUTMODE_ONE) {
-                               /* Search for the best section. */
-                               sec = res[i].file;
+                       for (ib = i = 0; i < resnsz; i++) {
+                               sec = resn[i].file;

                                sec += strcspn(sec, "123456789");
                                if (sec[0] == '\0')
                                        continue; /* No section at all. */
                                sec += strcspn(sec, "123456789");
                                if (sec[0] == '\0')
                                        continue; /* No section at all. */


@@ -508,45 +539,70 @@ main(int argc, char *argv[])
                                        sec++; /* Prefer without suffix. */
                                if (*sec != '/')
                                        prio += 10; /* Wrong dir name. */
                                        sec++; /* Prefer without suffix. */
                                if (*sec != '/')
                                        prio += 10; /* Wrong dir name. */

-                               if (search.sec != NULL &&
-                                   (strlen(sec) <= ssz  + 3 ||
-                                    strcmp(sec + strlen(sec) - ssz,
-                                     search.sec) != 0))
-                                       prio += 20; /* Wrong file ext. */
+                               if (search.sec != NULL) {
+                                       ep = strchr(sec, '\0');
+                                       if (ep - sec > 3 &&
+                                           strncmp(ep - 3, ".gz", 3) == 0)
+                                               ep -= 3;
+                                       if ((size_t)(ep - sec) < ssz + 3 ||
+                                           strncmp(ep - ssz, search.sec,
+                                            ssz) != 0)      /* Wrong file */
+                                               prio += 20;  /* extension. */
+                               }

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

-                               resp = res + i;
+                               ib = i;

                        }
                        }

+                       res = mandoc_reallocarray(res, ressz + 1,
+                           sizeof(*res));
+                       memcpy(res + ressz++, resn + ib, sizeof(*resn));
+                       memset(resn + ib, 0, sizeof(*resn));
+                       mansearch_free(resn, resnsz);
+                       resn = NULL;
+                       resnsz = 0;

                }
 
                }
 

-               /*
-                * For man(1), -a and -i output mode, fall through
-                * to the main mandoc(1) code iterating files
-                * and running the parsers on each of them.
-                */
+       /* apropos(1), whatis(1): Process the full search expression. */

 
 

-               if (outmode == OUTMODE_FLN || outmode == OUTMODE_LST)
+       } else if (search.argmode != ARG_FILE) {
+               if (mansearch(&search, &conf.manpath,
+                   argc, argv, &res, &ressz) == 0)
+                       usage(search.argmode);
+
+               if (ressz == 0) {
+                       warnx("nothing appropriate");
+                       mandoc_msg_setrc(MANDOCLEVEL_BADARG);

                        goto out;
                        goto out;

-       }
+               }

 
 

-       /* mandoc(1) */
+       /* mandoc(1): Take command line arguments as file names. */

 
 

-#if HAVE_PLEDGE
-       if (use_pager) {
-               if (pledge("stdio rpath tmppath tty proc exec", NULL) == -1) {
-                       mandoc_msg(MANDOCERR_PLEDGE, 0, 0,
-                           "%s", strerror(errno));
-                       return mandoc_msg_getrc();
-               }

        } else {
        } else {

-               if (pledge("stdio rpath", NULL) == -1) {
-                       mandoc_msg(MANDOCERR_PLEDGE, 0, 0,
-                           "%s", strerror(errno));
-                       return mandoc_msg_getrc();
+               ressz = argc > 0 ? argc : 1;
+               res = mandoc_calloc(ressz, sizeof(*res));
+               for (i = 0; i < ressz; i++) {
+                       if (argc > 0)
+                               res[i].file = mandoc_strdup(argv[i]);
+                       res[i].ipath = SIZE_MAX;
+                       res[i].form = FORM_SRC;

                }
        }
                }
        }

-#endif
+
+       switch (outmode) {
+       case OUTMODE_FLN:
+               for (i = 0; i < ressz; i++)
+                       puts(res[i].file);
+               goto out;
+       case OUTMODE_LST:
+               for (i = 0; i < ressz; i++)
+                       printf("%s - %s\n", res[i].names,
+                           res[i].output == NULL ? "" :
+                           res[i].output);
+               goto out;
+       default:
+               break;
+       }

 
        if (search.argmode == ARG_FILE && auxpaths != NULL) {
                if (strcmp(auxpaths, "doc") == 0)
 
        if (search.argmode == ARG_FILE && auxpaths != NULL) {
                if (strcmp(auxpaths, "doc") == 0)


@@ -558,18 +614,6 @@ main(int argc, char *argv[])
        mchars_alloc();
        mp = mparse_alloc(options, os_e, os_s);
 
        mchars_alloc();
        mp = mparse_alloc(options, os_e, os_s);
 

-       if (argc < 1) {
-               if (use_pager) {
-                       tag_files = tag_init();
-                       if (tag_files != NULL)
-                               tag_files->tagname = conf.output.tag;
-               }
-               thisarg = "<stdin>";
-               mandoc_msg_setinfilename(thisarg);
-               parse(mp, STDIN_FILENO, thisarg, &outst, &conf.output);
-               mandoc_msg_setinfilename(NULL);
-       }
-

        /*
         * Remember the original working directory, if possible.
         * This will be needed if some names on the command line
        /*
         * Remember the original working directory, if possible.
         * This will be needed if some names on the command line


@@ -578,77 +622,19 @@ main(int argc, char *argv[])
         * readable: Maybe it won't be needed after all.
         */
        startdir = open(".", O_RDONLY | O_DIRECTORY);
         * readable: Maybe it won't be needed after all.
         */
        startdir = open(".", O_RDONLY | O_DIRECTORY);

-
-       while (argc > 0) {
-
-               /*
-                * Changing directories is not needed in ARG_FILE mode.
-                * Do it on a best-effort basis.  Even in case of
-                * failure, some functionality may still work.
-                */
-               if (resp != NULL) {
-                       if (resp->ipath != SIZE_MAX)
-                               (void)chdir(conf.manpath.paths[resp->ipath]);
-                       else if (startdir != -1)
-                               (void)fchdir(startdir);
-                       thisarg = resp->file;
-               } else
-                       thisarg = *argv;
-
-               mandoc_msg_setinfilename(thisarg);
-               fd = mparse_open(mp, thisarg);
-               if (fd != -1) {
-                       if (use_pager) {
-                               use_pager = 0;
-                               tag_files = tag_init();
-                               if (tag_files != NULL)
-                                       tag_files->tagname = conf.output.tag;
-                       }
-
-                       if (resp == NULL || resp->form == FORM_SRC)
-                               parse(mp, fd, thisarg, &outst, &conf.output);
-                       else
-                               passthrough(fd, conf.output.synopsisonly);
-
-                       if (ferror(stdout)) {
-                               if (tag_files != NULL) {
-                                       mandoc_msg(MANDOCERR_WRITE, 0, 0,
-                                           "%s: %s", tag_files->ofn,
-                                           strerror(errno));
-                                       tag_unlink();
-                                       tag_files = NULL;
-                               } else
-                                       mandoc_msg(MANDOCERR_WRITE, 0, 0,
-                                           "%s", strerror(errno));
-                               break;
-                       }
-
-                       if (argc > 1 && outst.outtype <= OUTT_UTF8) {
-                               if (outst.outdata == NULL)
-                                       outdata_alloc(&outst, &conf.output);
-                               terminal_sepline(outst.outdata);
-                       }
-               } else
-                       mandoc_msg(resp == NULL ? MANDOCERR_BADARG_BAD :
-                           MANDOCERR_OPEN, 0, 0, "%s", strerror(errno));
-
-               mandoc_msg_setinfilename(NULL);
-
+       for (i = 0; i < ressz; i++) {
+               process_onefile(mp, res + i, startdir, &outst, &conf);

                if (outst.wstop && mandoc_msg_getrc() != MANDOCLEVEL_OK)
                        break;
                if (outst.wstop && mandoc_msg_getrc() != MANDOCLEVEL_OK)
                        break;

-
-               if (resp != NULL)
-                       resp++;
-               else
-                       argv++;
-               if (--argc)
-                       mparse_reset(mp);

        }
        if (startdir != -1) {
                (void)fchdir(startdir);
                close(startdir);
        }
        }
        if (startdir != -1) {
                (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:


@@ -672,18 +658,17 @@ main(int argc, char *argv[])
        mchars_free();
 
 out:
        mchars_free();
 
 out:

-       if (search.argmode != ARG_FILE) {
+       mansearch_free(res, ressz);
+       if (search.argmode != ARG_FILE)

                manconf_free(&conf);
                manconf_free(&conf);

-               mansearch_free(res, sz);
-       }

 
 

-       if (tag_files != NULL) {
-               fclose(stdout);
-               tag_write();
-               run_pager(tag_files);
-               tag_unlink();
-       } else if (outst.outtype != OUTT_LINT &&
-           (search.argmode == ARG_FILE || sz > 0))
+       if (outst.tag_files != NULL) {
+               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();
 
        return (int)mandoc_msg_getrc();
                mandoc_msg_summary();
 
        return (int)mandoc_msg_getrc();


@@ -717,6 +702,42 @@ usage(enum argmode argmode)
        exit((int)MANDOCLEVEL_BADARG);
 }
 
        exit((int)MANDOCLEVEL_BADARG);
 }
 

+static void
+glob_esc(char **dst, const char *src, const char *suffix)
+{
+       while (*src != '\0') {
+               if (strchr("*?[", *src) != NULL)
+                       *(*dst)++ = '\\';
+               *(*dst)++ = *src++;
+       }
+       while (*suffix != '\0')
+               *(*dst)++ = *suffix++;
+}
+
+static void
+fs_append(char **file, size_t filesz, int copy, size_t ipath,
+    const char *sec, enum form form, struct manpage **res, size_t *ressz)
+{
+       struct manpage  *page;
+
+       *res = mandoc_reallocarray(*res, *ressz + filesz, sizeof(**res));
+       page = *res + *ressz;
+       *ressz += filesz;
+       for (;;) {
+               page->file = copy ? mandoc_strdup(*file) : *file;
+               page->names = NULL;
+               page->output = NULL;
+               page->bits = NAME_FILE & NAME_MASK;
+               page->ipath = ipath;
+               page->sec = (*sec >= '1' && *sec <= '9') ? *sec - '1' + 1 : 10;
+               page->form = form;
+               if (--filesz == 0)
+                       break;
+               file++;
+               page++;
+       }
+}
+

 static int
 fs_lookup(const struct manpaths *paths, size_t ipath,
        const char *sec, const char *arch, const char *name,
 static int
 fs_lookup(const struct manpaths *paths, size_t ipath,
        const char *sec, const char *arch, const char *name,


@@ -724,12 +745,19 @@ fs_lookup(const struct manpaths *paths, size_t ipath,
 {
        struct stat      sb;
        glob_t           globinfo;
 {
        struct stat      sb;
        glob_t           globinfo;

-       struct manpage  *page;
-       char            *file;
+       char            *file, *cp, secnum[2];

        int              globres;
        enum form        form;
 
        int              globres;
        enum form        form;
 

+       const char *const slman = "/man";
+       const char *const slash = "/";
+       const char *const sglob = ".[01-9]*";
+       const char *const dot   = ".";
+       const char *const aster = "*";
+
+       memset(&globinfo, 0, sizeof(globinfo));

        form = FORM_SRC;
        form = FORM_SRC;

+

        mandoc_asprintf(&file, "%s/man%s/%s.%s",
            paths->paths[ipath], sec, name, sec);
        if (stat(file, &sb) != -1)
        mandoc_asprintf(&file, "%s/man%s/%s.%s",
            paths->paths[ipath], sec, name, sec);
        if (stat(file, &sb) != -1)


@@ -752,21 +780,46 @@ fs_lookup(const struct manpaths *paths, size_t ipath,
                free(file);
        }
 
                free(file);
        }
 

-       mandoc_asprintf(&file, "%s/man%s/%s.[01-9]*",
-           paths->paths[ipath], sec, name);
+       cp = file = mandoc_malloc(strlen(paths->paths[ipath]) * 2 +
+           strlen(slman) + strlen(sec) * 2 + strlen(slash) +
+           strlen(name) * 2 + strlen(sglob) + 1);
+       glob_esc(&cp, paths->paths[ipath], slman);
+       glob_esc(&cp, sec, slash);
+       glob_esc(&cp, name, sglob);
+       *cp = '\0';

        globres = glob(file, 0, NULL, &globinfo);
        if (globres != 0 && globres != GLOB_NOMATCH)
                mandoc_msg(MANDOCERR_GLOB, 0, 0,
                    "%s: %s", file, strerror(errno));
        free(file);
        globres = glob(file, 0, NULL, &globinfo);
        if (globres != 0 && globres != GLOB_NOMATCH)
                mandoc_msg(MANDOCERR_GLOB, 0, 0,
                    "%s: %s", file, strerror(errno));
        free(file);

+       file = NULL;

        if (globres == 0)
        if (globres == 0)

-               file = mandoc_strdup(*globinfo.gl_pathv);
+               goto found;

        globfree(&globinfo);
        globfree(&globinfo);

-       if (globres == 0) {
-               if (stat(file, &sb) != -1)
-                       goto found;
+
+       if (sec[1] != '\0' && *ressz == 0) {
+               secnum[0] = sec[0];
+               secnum[1] = '\0';
+               cp = file = mandoc_malloc(strlen(paths->paths[ipath]) * 2 +
+                   strlen(slman) + strlen(secnum) * 2 + strlen(slash) +
+                   strlen(name) * 2 + strlen(dot) +
+                   strlen(sec) * 2 + strlen(aster) + 1);
+               glob_esc(&cp, paths->paths[ipath], slman);
+               glob_esc(&cp, secnum, slash);
+               glob_esc(&cp, name, dot);
+               glob_esc(&cp, sec, aster);
+               *cp = '\0';
+               globres = glob(file, 0, NULL, &globinfo);
+               if (globres != 0 && globres != GLOB_NOMATCH)
+                       mandoc_msg(MANDOCERR_GLOB, 0, 0,
+                           "%s: %s", file, strerror(errno));

                free(file);
                free(file);

+               file = NULL;
+               if (globres == 0)
+                       goto found;
+               globfree(&globinfo);

        }
        }

+

        if (res != NULL || ipath + 1 != paths->sz)
                return -1;
 
        if (res != NULL || ipath + 1 != paths->sz)
                return -1;
 


@@ -778,80 +831,132 @@ fs_lookup(const struct manpaths *paths, size_t ipath,
 found:
        warnx("outdated mandoc.db lacks %s(%s) entry, run %s %s",
            name, sec, BINM_MAKEWHATIS, paths->paths[ipath]);
 found:
        warnx("outdated mandoc.db lacks %s(%s) entry, run %s %s",
            name, sec, BINM_MAKEWHATIS, paths->paths[ipath]);

-       if (res == NULL) {
+       if (res == NULL)

                free(file);
                free(file);

-               return 0;
-       }
-       *res = mandoc_reallocarray(*res, ++*ressz, sizeof(**res));
-       page = *res + (*ressz - 1);
-       page->file = file;
-       page->names = NULL;
-       page->output = NULL;
-       page->bits = NAME_FILE & NAME_MASK;
-       page->ipath = ipath;
-       page->sec = (*sec >= '1' && *sec <= '9') ? *sec - '1' + 1 : 10;
-       page->form = form;
+       else if (file == NULL)
+               fs_append(globinfo.gl_pathv, globinfo.gl_pathc, 1,
+                   ipath, sec, form, res, ressz);
+       else
+               fs_append(&file, 1, 0, ipath, sec, form, res, ressz);
+       globfree(&globinfo);

        return 0;
 }
 
 static int
 fs_search(const struct mansearch *cfg, const struct manpaths *paths,
        return 0;
 }
 
 static int
 fs_search(const struct mansearch *cfg, const struct manpaths *paths,

-       int argc, char **argv, struct manpage **res, size_t *ressz)
+       const char *name, struct manpage **res, size_t *ressz)

 {
        const char *const sections[] =
            {"1", "8", "6", "2", "3", "5", "7", "4", "9", "3p"};
        const size_t nsec = sizeof(sections)/sizeof(sections[0]);
 
 {
        const char *const sections[] =
            {"1", "8", "6", "2", "3", "5", "7", "4", "9", "3p"};
        const size_t nsec = sizeof(sections)/sizeof(sections[0]);
 

-       size_t           ipath, isec, lastsz;
+       size_t           ipath, isec;

 
        assert(cfg->argmode == ARG_NAME);
 
        assert(cfg->argmode == ARG_NAME);

-

        if (res != NULL)
                *res = NULL;
        if (res != NULL)
                *res = NULL;

-       *ressz = lastsz = 0;
-       while (argc) {
-               for (ipath = 0; ipath < paths->sz; ipath++) {
-                       if (cfg->sec != NULL) {
-                               if (fs_lookup(paths, ipath, cfg->sec,
-                                   cfg->arch, *argv, res, ressz) != -1 &&
-                                   cfg->firstmatch)
-                                       return 0;
-                       } else for (isec = 0; isec < nsec; isec++)
+       *ressz = 0;
+       for (ipath = 0; ipath < paths->sz; ipath++) {
+               if (cfg->sec != NULL) {
+                       if (fs_lookup(paths, ipath, cfg->sec, cfg->arch,
+                           name, res, ressz) != -1 && cfg->firstmatch)
+                               return 0;
+               } else {
+                       for (isec = 0; isec < nsec; isec++)

                                if (fs_lookup(paths, ipath, sections[isec],
                                if (fs_lookup(paths, ipath, sections[isec],

-                                   cfg->arch, *argv, res, ressz) != -1 &&
+                                   cfg->arch, name, res, ressz) != -1 &&

                                    cfg->firstmatch)
                                        return 0;
                }
                                    cfg->firstmatch)
                                        return 0;
                }

-               if (res != NULL && *ressz == lastsz &&
-                   strchr(*argv, '/') == NULL) {
-                       if (cfg->arch != NULL &&
-                           arch_valid(cfg->arch, OSENUM) == 0)
-                               warnx("Unknown architecture \"%s\".",
-                                   cfg->arch);
-                       else if (cfg->sec == NULL)
-                               warnx("No entry for %s in the manual.",
-                                   *argv);
-                       else
-                               warnx("No entry for %s in section %s "
-                                   "of the manual.", *argv, cfg->sec);
-               }
-               lastsz = *ressz;
-               argv++;
-               argc--;

        }
        return -1;
 }
 
 static void
        }
        return -1;
 }
 
 static void

-parse(struct mparse *mp, int fd, const char *file,
-    struct outstate *outst, struct manoutput *outconf)
+process_onefile(struct mparse *mp, struct manpage *resp, int startdir,
+    struct outstate *outst, struct manconf *conf)

 {
 {

-       struct roff_meta *meta;
+       int      fd;
+
+       /*
+        * Changing directories is not needed in ARG_FILE mode.
+        * Do it on a best-effort basis.  Even in case of
+        * failure, some functionality may still work.
+        */
+       if (resp->ipath != SIZE_MAX)
+               (void)chdir(conf->manpath.paths[resp->ipath]);
+       else if (startdir != -1)
+               (void)fchdir(startdir);
+
+       mandoc_msg_setinfilename(resp->file);
+       if (resp->file != NULL) {
+               if ((fd = mparse_open(mp, resp->file)) == -1) {
+                       mandoc_msg(resp->ipath == SIZE_MAX ?
+                           MANDOCERR_BADARG_BAD : MANDOCERR_OPEN,
+                           0, 0, "%s", strerror(errno));
+                       mandoc_msg_setinfilename(NULL);
+                       return;
+               }
+       } else
+               fd = STDIN_FILENO;
+
+       if (outst->use_pager) {
+               outst->use_pager = 0;
+               outst->tag_files = term_tag_init(conf->output.outfilename,
+                   outst->outtype == OUTT_HTML ? ".html" : "",
+                   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)
+                       outdata_alloc(outst, &conf->output);
+               terminal_sepline(outst->outdata);
+       }

 
 

-       /* Begin by parsing the file itself. */
+       if (resp->form == FORM_SRC)
+               parse(mp, fd, resp->file, outst, conf);
+       else {
+               passthrough(fd, conf->output.synopsisonly);
+               outst->had_output = 1;
+       }
+
+       if (ferror(stdout)) {
+               if (outst->tag_files != NULL) {
+                       mandoc_msg(MANDOCERR_WRITE, 0, 0, "%s: %s",
+                           outst->tag_files->ofn, strerror(errno));
+                       term_tag_unlink();
+                       outst->tag_files = NULL;
+               } else
+                       mandoc_msg(MANDOCERR_WRITE, 0, 0, "%s",
+                           strerror(errno));
+       }
+       mandoc_msg_setinfilename(NULL);
+}
+
+static void
+parse(struct mparse *mp, int fd, const char *file,
+    struct outstate *outst, struct manconf *conf)
+{
+       static struct manpaths   basepaths;
+       static int               previous;
+       struct roff_meta        *meta;

 
 

-       assert(file);

        assert(fd >= 0);
        assert(fd >= 0);

+       if (file == NULL)
+               file = "<stdin>";
+
+       if (previous)
+               mparse_reset(mp);
+       else
+               previous = 1;

 
        mparse_readfd(mp, fd, file);
        if (fd != STDIN_FILENO)
 
        mparse_readfd(mp, fd, file);
        if (fd != STDIN_FILENO)


@@ -866,15 +971,16 @@ parse(struct mparse *mp, int fd, const char *file,
                return;
 
        if (outst->outdata == NULL)
                return;
 
        if (outst->outdata == NULL)

-               outdata_alloc(outst, outconf);
+               outdata_alloc(outst, &conf->output);

        else if (outst->outtype == OUTT_HTML)
        else if (outst->outtype == OUTT_HTML)

-               html_reset(outst);
+               html_reset(outst->outdata);

 
        mandoc_xr_reset();
        meta = mparse_result(mp);
 
        /* Execute the out device, if it exists. */
 
 
        mandoc_xr_reset();
        meta = mparse_result(mp);
 
        /* Execute the out device, if it exists. */
 

+       outst->had_output = 1;

        if (meta->macroset == MACROSET_MDOC) {
                switch (outst->outtype) {
                case OUTT_HTML:
        if (meta->macroset == MACROSET_MDOC) {
                switch (outst->outtype) {
                case OUTT_HTML:


@@ -918,25 +1024,32 @@ parse(struct mparse *mp, int fd, const char *file,
                case OUTT_PS:
                        terminal_man(outst->outdata, meta);
                        break;
                case OUTT_PS:
                        terminal_man(outst->outdata, meta);
                        break;

+               case OUTT_MARKDOWN:
+                       mandoc_msg(MANDOCERR_MAN_TMARKDOWN, 0, 0, NULL);
+                       break;

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

-       if (mandoc_msg_getmin() < MANDOCERR_STYLE)
-               check_xr();
+       if (conf->output.tag != NULL && conf->output.tag_found == 0 &&
+           tag_exists(conf->output.tag))
+               conf->output.tag_found = 1;
+
+       if (mandoc_msg_getmin() < MANDOCERR_STYLE) {
+               if (basepaths.sz == 0)
+                       manpath_base(&basepaths);
+               check_xr(&basepaths);
+       } else if (mandoc_msg_getmin() < MANDOCERR_WARNING)
+               check_xr(&conf->manpath);

 }
 
 static void
 }
 
 static void

-check_xr(void)
+check_xr(struct manpaths *paths)

 {
 {

-       static struct manpaths   paths;

        struct mansearch         search;
        struct mandoc_xr        *xr;
        size_t                   sz;
 
        struct mansearch         search;
        struct mandoc_xr        *xr;
        size_t                   sz;
 

-       if (paths.sz == 0)
-               manpath_base(&paths);
-

        for (xr = mandoc_xr_get(); xr != NULL; xr = xr->next) {
                if (xr->line == -1)
                        continue;
        for (xr = mandoc_xr_get(); xr != NULL; xr = xr->next) {
                if (xr->line == -1)
                        continue;


@@ -945,9 +1058,9 @@ check_xr(void)
                search.outkey = NULL;
                search.argmode = ARG_NAME;
                search.firstmatch = 1;
                search.outkey = NULL;
                search.argmode = ARG_NAME;
                search.firstmatch = 1;

-               if (mansearch(&search, &paths, 1, &xr->name, NULL, &sz))
+               if (mansearch(&search, paths, 1, &xr->name, NULL, &sz))

                        continue;
                        continue;

-               if (fs_search(&search, &paths, 1, &xr->name, NULL, &sz) != -1)
+               if (fs_search(&search, paths, xr->name, NULL, &sz) != -1)

                        continue;
                if (xr->count == 1)
                        mandoc_msg(MANDOCERR_XR_BAD, xr->line,
                        continue;
                if (xr->count == 1)
                        mandoc_msg(MANDOCERR_XR_BAD, xr->line,


@@ -1112,29 +1225,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;
                }


@@ -1142,10 +1255,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. */
 


@@ -1166,25 +1279,28 @@ 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
        char            *argv[MAX_PAGER_ARGS];
        const char      *pager;
        char            *cp;
 {
        const struct timespec timeout = { 0, 100000000 };  /* 0.1s */
 #define MAX_PAGER_ARGS 16
        char            *argv[MAX_PAGER_ARGS];
        const char      *pager;
        char            *cp;

+       size_t           wordlen;

 #if HAVE_LESS_T
        size_t           cmdlen;
 #endif
        int              argc, use_ofn;
        pid_t            pager_pid;
 
 #if HAVE_LESS_T
        size_t           cmdlen;
 #endif
        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");
        if (pager == NULL || *pager == '\0')
        pager = getenv("MANPAGER");
        if (pager == NULL || *pager == '\0')
                pager = getenv("PAGER");
        if (pager == NULL || *pager == '\0')

-               pager = "more -s";
-       cp = mandoc_strdup(pager);
+               pager = BINM_PAGER;

 
        /*
         * Parse the pager command into words.
 
        /*
         * Parse the pager command into words.


@@ -1192,37 +1308,40 @@ spawn_pager(struct tag_files *tag_files)
         */
 
        argc = 0;
         */
 
        argc = 0;

-       while (argc + 5 < MAX_PAGER_ARGS) {
-               argv[argc++] = cp;
-               cp = strchr(cp, ' ');
-               if (cp == NULL)
-                       break;
-               *cp++ = '\0';
-               while (*cp == ' ')
-                       cp++;
-               if (*cp == '\0')
-                       break;
+       while (*pager != '\0' && argc + 5 < MAX_PAGER_ARGS) {
+               wordlen = strcspn(pager, " ");
+               argv[argc++] = mandoc_strndup(pager, wordlen);
+               pager += wordlen;
+               while (*pager == ' ')
+                       pager++;

        }
 
        /* For less(1), use the tag file. */
 
        use_ofn = 1;
 #if HAVE_LESS_T
        }
 
        /* For less(1), use the tag file. */
 
        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++] = mandoc_strdup(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++] = mandoc_strdup(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] = mandoc_strdup(outst->tag_files->ofn);
+               argc++;
+       }

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


@@ -1232,8 +1351,10 @@ spawn_pager(struct tag_files *tag_files)
        case 0:
                break;
        default:
        case 0:
                break;
        default:

+               while (argc > 0)
+                       free(argv[--argc]);

                (void)setpgid(pager_pid, 0);
                (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,


@@ -1241,20 +1362,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->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);
 
        while (tcgetpgrp(STDOUT_FILENO) != getpid())
                nanosleep(&timeout, NULL);