Support nesting of elements with next-line scope.

[mandoc.git] / main.c

diff --git a/main.c b/main.c
index 43a90ab8121855602e8815a7b17c7b378ed53b2e..cad227507eaf34302dd3c86e7646d25b69c96097 100644 (file)
--- a/main.c
+++ b/main.c
@@ -1,7 +1,7 @@
-/*     $Id: main.c,v 1.239 2015/07/17 22:38:29 schwarze Exp $ */
+/*     $Id: main.c,v 1.308 2018/08/23 19:33:27 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-2018 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


@@ -19,23 +19,33 @@
 #include "config.h"
 
 #include <sys/types.h>
 #include "config.h"
 
 #include <sys/types.h>

+#include <sys/ioctl.h>

 #include <sys/param.h> /* MACHINE */
 #include <sys/param.h> /* MACHINE */

+#include <sys/termios.h>

 #include <sys/wait.h>
 
 #include <assert.h>
 #include <ctype.h>
 #include <sys/wait.h>
 
 #include <assert.h>
 #include <ctype.h>

+#if HAVE_ERR
+#include <err.h>
+#endif

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

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

 #include <signal.h>
 #include <stdio.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 #include <signal.h>
 #include <stdio.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>

+#include <time.h>

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

+#include "mandoc_xr.h"

 #include "roff.h"
 #include "mdoc.h"
 #include "man.h"
 #include "roff.h"
 #include "mdoc.h"
 #include "man.h"


@@ -44,25 +54,14 @@
 #include "manconf.h"
 #include "mansearch.h"
 
 #include "manconf.h"
 #include "mansearch.h"
 

-#if !defined(__GNUC__) || (__GNUC__ < 2)
-# if !defined(lint)
-#  define __attribute__(x)
-# endif
-#endif /* !defined(__GNUC__) || (__GNUC__ < 2) */
-

 enum   outmode {
        OUTMODE_DEF = 0,
        OUTMODE_FLN,
        OUTMODE_LST,
        OUTMODE_ALL,
 enum   outmode {
        OUTMODE_DEF = 0,
        OUTMODE_FLN,
        OUTMODE_LST,
        OUTMODE_ALL,

-       OUTMODE_INT,

        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 */


@@ -70,6 +69,7 @@ enum  outt {
        OUTT_TREE,      /* -Ttree */
        OUTT_MAN,       /* -Tman */
        OUTT_HTML,      /* -Thtml */
        OUTT_TREE,      /* -Ttree */
        OUTT_MAN,       /* -Tman */
        OUTT_HTML,      /* -Thtml */

+       OUTT_MARKDOWN,  /* -Tmarkdown */

        OUTT_LINT,      /* -Tlint */
        OUTT_PS,        /* -Tps */
        OUTT_PDF        /* -Tpdf */
        OUTT_LINT,      /* -Tlint */
        OUTT_PS,        /* -Tps */
        OUTT_PDF        /* -Tpdf */


@@ -77,78 +77,93 @@ enum        outt {
 
 struct curparse {
        struct mparse    *mp;
 
 struct curparse {
        struct mparse    *mp;

-       struct mchars    *mchars;       /* character table */
-       enum mandoclevel  wlevel;       /* ignore messages below this */
+       struct manoutput *outopts;      /* output options */
+       void             *outdata;      /* data for output */
+       char             *os_s;         /* operating system for display */

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

+       enum mandocerr    mmin;         /* ignore messages below this */
+       enum mandoc_os    os_e;         /* check base system conventions */

        enum outt         outtype;      /* which output to use */
        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 */

 };
 
 };
 

+
+int                      mandocdb(int, char *[]);
+
+static void              check_xr(const char *);

 static int               fs_lookup(const struct manpaths *,
                                size_t ipath, const char *,
                                const char *, const char *,
                                struct manpage **, size_t *);
 static int               fs_lookup(const struct manpaths *,
                                size_t ipath, const char *,
                                const char *, const char *,
                                struct manpage **, size_t *);

-static void              fs_search(const struct mansearch *,
+static int               fs_search(const struct mansearch *,

                                const struct manpaths *, int, char**,
                                struct manpage **, size_t *);
                                const struct manpaths *, int, char**,
                                struct manpage **, size_t *);

-static void              handle_sigpipe(int);

 static int               koptions(int *, char *);
 static int               koptions(int *, char *);

-#if HAVE_SQLITE3
-int                      mandocdb(int, char**);
-#endif
-static int               moptions(int *, char *);
+static void              moptions(int *, char *);

 static void              mmsg(enum mandocerr, enum mandoclevel,
                                const char *, int, int, const char *);
 static void              mmsg(enum mandocerr, enum mandoclevel,
                                const char *, int, int, const char *);

+static void              outdata_alloc(struct curparse *);

 static void              parse(struct curparse *, int, const char *);
 static void              passthrough(const char *, int, int);
 static void              parse(struct curparse *, int, const char *);
 static void              passthrough(const char *, int, int);

-static pid_t             spawn_pager(void);
+static pid_t             spawn_pager(struct tag_files *);

 static int               toptions(struct curparse *, char *);
 static int               toptions(struct curparse *, char *);

-static void              usage(enum argmode) __attribute__((noreturn));
+static void              usage(enum argmode) __attribute__((__noreturn__));

 static int               woptions(struct curparse *, char *);
 
 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 int               woptions(struct curparse *, char *);
 
 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 char       *progname;

 static enum mandoclevel  rc;
 static enum mandoclevel  rc;

+static FILE             *mmsg_stream;

 
 
 int
 main(int argc, char *argv[])
 {
        struct manconf   conf;
 
 
 int
 main(int argc, char *argv[])
 {
        struct manconf   conf;

-       struct curparse  curp;

        struct mansearch search;
        struct mansearch search;

-       char            *auxpaths;
-       char            *defos;
-       unsigned char   *uc;
+       struct curparse  curp;
+       struct winsize   ws;
+       struct tag_files *tag_files;

        struct manpage  *res, *resp;
        struct manpage  *res, *resp;

-       char            *conf_file, *defpaths;
-       size_t           isec, i, sz;
+       const char      *progname, *sec, *thisarg;
+       char            *conf_file, *defpaths, *auxpaths;
+       char            *oarg;
+       unsigned char   *uc;
+       size_t           i, sz;

        int              prio, best_prio;
        int              prio, best_prio;

-       char             sec;
-       enum mandoclevel rctmp;

        enum outmode     outmode;
        enum outmode     outmode;

-       int              fd;
+       int              fd, startdir;

        int              show_usage;
        int              options;
        int              show_usage;
        int              options;

+       int              use_pager;
+       int              status, signum;

        int              c;
        int              c;

-       pid_t            pager_pid;  /* 0: don't use; 1: not yet spawned. */
+       pid_t            pager_pid, tc_pgid, man_pgid, pid;

 
 

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

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

-               progname = "mandoc";
+               progname = mandoc_strdup("mandoc");

        else if ((progname = strrchr(argv[0], '/')) == NULL)
                progname = argv[0];
        else
                ++progname;
        else if ((progname = strrchr(argv[0], '/')) == NULL)
                progname = argv[0];
        else
                ++progname;

+       setprogname(progname);
+#endif

 
 

-#if HAVE_SQLITE3
-       if (strcmp(progname, BINM_MAKEWHATIS) == 0)
-               return(mandocdb(argc, argv));
+       if (strncmp(progname, "mandocdb", 8) == 0 ||
+           strcmp(progname, BINM_MAKEWHATIS) == 0)
+               return mandocdb(argc, argv);
+
+#if HAVE_PLEDGE
+       if (pledge("stdio rpath tmppath tty proc exec", NULL) == -1)
+               err((int)MANDOCLEVEL_SYSERR, "pledge");
+#endif
+
+#if HAVE_SANDBOX_INIT
+       if (sandbox_init(kSBXProfileNoInternet, SANDBOX_NAMED, NULL) == -1)
+               errx((int)MANDOCLEVEL_SYSERR, "sandbox_init");

 #endif
 
        /* Search options. */
 #endif
 
        /* Search options. */


@@ -159,6 +174,7 @@ main(int argc, char *argv[])
 
        memset(&search, 0, sizeof(struct mansearch));
        search.outkey = "Nd";
 
        memset(&search, 0, sizeof(struct mansearch));
        search.outkey = "Nd";

+       oarg = NULL;

 
        if (strcmp(progname, BINM_MAN) == 0)
                search.argmode = ARG_NAME;
 
        if (strcmp(progname, BINM_MAN) == 0)
                search.argmode = ARG_NAME;


@@ -175,17 +191,22 @@ main(int argc, char *argv[])
 
        memset(&curp, 0, sizeof(struct curparse));
        curp.outtype = OUTT_LOCALE;
 
        memset(&curp, 0, sizeof(struct curparse));
        curp.outtype = OUTT_LOCALE;

-       curp.wlevel  = MANDOCLEVEL_BADARG;
+       curp.mmin = MANDOCERR_MAX;

        curp.outopts = &conf.output;
        options = MPARSE_SO | MPARSE_UTF8 | MPARSE_LATIN1;
        curp.outopts = &conf.output;
        options = MPARSE_SO | MPARSE_UTF8 | MPARSE_LATIN1;

-       defos = NULL;
+       mmsg_stream = stderr;

 
 

-       pager_pid = 1;
+       use_pager = 1;
+       tag_files = NULL;

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

-       while (-1 != (c = getopt(argc, argv,
-                       "aC:cfhI:iK:klM:m:O:S:s:T:VW:w"))) {
+       while ((c = getopt(argc, argv,
+           "aC:cfhI:iK:klM:m:O:S:s:T:VW:w")) != -1) {
+               if (c == 'i' && search.argmode == ARG_EXPR) {
+                       optind--;
+                       break;
+               }

                switch (c) {
                case 'a':
                        outmode = OUTMODE_ALL;
                switch (c) {
                case 'a':
                        outmode = OUTMODE_ALL;


@@ -194,37 +215,30 @@ main(int argc, char *argv[])
                        conf_file = optarg;
                        break;
                case 'c':
                        conf_file = optarg;
                        break;
                case 'c':

-                       pager_pid = 0;
+                       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;

-                       pager_pid = 0;
+                       use_pager = 0;

                        outmode = OUTMODE_ALL;
                        break;
                case 'I':
                        if (strncmp(optarg, "os=", 3)) {
                        outmode = OUTMODE_ALL;
                        break;
                case 'I':
                        if (strncmp(optarg, "os=", 3)) {

-                               fprintf(stderr,
-                                   "%s: -I %s: Bad argument\n",
-                                   progname, optarg);
-                               return((int)MANDOCLEVEL_BADARG);
+                               warnx("-I %s: Bad argument", optarg);
+                               return (int)MANDOCLEVEL_BADARG;

                        }
                        }

-                       if (defos) {
-                               fprintf(stderr,
-                                   "%s: -I %s: Duplicate argument\n",
-                                   progname, optarg);
-                               return((int)MANDOCLEVEL_BADARG);
+                       if (curp.os_s != NULL) {
+                               warnx("-I %s: Duplicate argument", optarg);
+                               return (int)MANDOCLEVEL_BADARG;

                        }
                        }

-                       defos = mandoc_strdup(optarg + 3);
-                       break;
-               case 'i':
-                       outmode = OUTMODE_INT;
+                       curp.os_s = mandoc_strdup(optarg + 3);

                        break;
                case 'K':
                        if ( ! koptions(&options, optarg))
                        break;
                case 'K':
                        if ( ! koptions(&options, optarg))

-                               return((int)MANDOCLEVEL_BADARG);
+                               return (int)MANDOCLEVEL_BADARG;

                        break;
                case 'k':
                        search.argmode = ARG_EXPR;
                        break;
                case 'k':
                        search.argmode = ARG_EXPR;


@@ -240,10 +254,7 @@ main(int argc, char *argv[])
                        auxpaths = optarg;
                        break;
                case 'O':
                        auxpaths = optarg;
                        break;
                case 'O':

-                       search.outkey = optarg;
-                       while (optarg != NULL)
-                               manconf_output(&conf.output,
-                                   strsep(&optarg, ","));
+                       oarg = optarg;

                        break;
                case 'S':
                        search.arch = optarg;
                        break;
                case 'S':
                        search.arch = optarg;


@@ -253,11 +264,11 @@ main(int argc, char *argv[])
                        break;
                case 'T':
                        if ( ! toptions(&curp, optarg))
                        break;
                case 'T':
                        if ( ! toptions(&curp, optarg))

-                               return((int)MANDOCLEVEL_BADARG);
+                               return (int)MANDOCLEVEL_BADARG;

                        break;
                case 'W':
                        if ( ! woptions(&curp, optarg))
                        break;
                case 'W':
                        if ( ! woptions(&curp, optarg))

-                               return((int)MANDOCLEVEL_BADARG);
+                               return (int)MANDOCLEVEL_BADARG;

                        break;
                case 'w':
                        outmode = OUTMODE_FLN;
                        break;
                case 'w':
                        outmode = OUTMODE_FLN;


@@ -277,7 +288,7 @@ main(int argc, char *argv[])
                switch (search.argmode) {
                case ARG_FILE:
                        outmode = OUTMODE_ALL;
                switch (search.argmode) {
                case ARG_FILE:
                        outmode = OUTMODE_ALL;

-                       pager_pid = 0;
+                       use_pager = 0;

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


@@ -288,6 +299,42 @@ main(int argc, char *argv[])
                }
        }
 
                }
        }
 

+       if (oarg != NULL) {
+               if (outmode == OUTMODE_LST)
+                       search.outkey = oarg;
+               else {
+                       while (oarg != NULL) {
+                               thisarg = oarg;
+                               if (manconf_output(&conf.output,
+                                   strsep(&oarg, ","), 0) == 0)
+                                       continue;
+                               warnx("-O %s: Bad argument", thisarg);
+                               return (int)MANDOCLEVEL_BADARG;
+                       }
+               }
+       }
+
+       if (outmode == OUTMODE_FLN ||
+           outmode == OUTMODE_LST ||
+           !isatty(STDOUT_FILENO))
+               use_pager = 0;
+
+       if (use_pager &&
+           (conf.output.width == 0 || conf.output.indent == 0) &&
+           ioctl(STDOUT_FILENO, TIOCGWINSZ, &ws) != -1 &&
+           ws.ws_col > 1) {
+               if (conf.output.width == 0 && ws.ws_col < 79)
+                       conf.output.width = ws.ws_col - 1;
+               if (conf.output.indent == 0 && ws.ws_col < 66)
+                       conf.output.indent = 3;
+       }
+
+#if HAVE_PLEDGE
+       if (!use_pager)
+               if (pledge("stdio rpath", NULL) == -1)
+                       err((int)MANDOCLEVEL_SYSERR, "pledge");
+#endif
+

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


@@ -329,9 +376,6 @@ main(int argc, char *argv[])
        /* man(1), whatis(1), apropos(1) */
 
        if (search.argmode != ARG_FILE) {
        /* man(1), whatis(1), apropos(1) */
 
        if (search.argmode != ARG_FILE) {

-               if (argc == 0)
-                       usage(search.argmode);
-

                if (search.argmode == ARG_NAME &&
                    outmode == OUTMODE_ONE)
                        search.firstmatch = 1;
                if (search.argmode == ARG_NAME &&
                    outmode == OUTMODE_ONE)
                        search.firstmatch = 1;


@@ -339,31 +383,38 @@ main(int argc, char *argv[])
                /* Access the mandoc database. */
 
                manconf_parse(&conf, conf_file, defpaths, auxpaths);
                /* Access the mandoc database. */
 
                manconf_parse(&conf, conf_file, defpaths, auxpaths);

-#if HAVE_SQLITE3
-               mansearch_setup(1);

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

-#else
-               if (search.argmode != ARG_NAME) {
-                       fputs("mandoc: database support not compiled in\n",
-                           stderr);
-                       return((int)MANDOCLEVEL_BADARG);
-               }
-               sz = 0;
-#endif

 
 

-               if (sz == 0) {
-                       if (search.argmode == ARG_NAME)
-                               fs_search(&search, &conf.manpath,
-                                   argc, argv, &res, &sz);
-                       else
-                               fprintf(stderr,
-                                   "%s: nothing appropriate\n",
-                                   progname);
+               if (sz == 0 && search.argmode == ARG_NAME)
+                       fs_search(&search, &conf.manpath,
+                           argc, argv, &res, &sz);
+
+               if (search.argmode == ARG_NAME) {
+                       for (c = 0; c < argc; c++) {
+                               if (strchr(argv[c], '/') == NULL)
+                                       continue;
+                               if (access(argv[c], R_OK) == -1) {
+                                       warn("%s", argv[c]);
+                                       continue;
+                               }
+                               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].ipath = SIZE_MAX;
+                               res[sz].bits = 0;
+                               res[sz].sec = 10;
+                               res[sz].form = FORM_SRC;
+                               sz++;
+                       }

                }
 
                if (sz == 0) {
                }
 
                if (sz == 0) {

+                       if (search.argmode != ARG_NAME)
+                               warnx("nothing appropriate");

                        rc = MANDOCLEVEL_BADARG;
                        goto out;
                }
                        rc = MANDOCLEVEL_BADARG;
                        goto out;
                }


@@ -376,7 +427,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;
 


@@ -392,11 +443,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;


@@ -416,52 +469,85 @@ main(int argc, char *argv[])
 
        /* mandoc(1) */
 
 
        /* mandoc(1) */
 

-       if (search.argmode == ARG_FILE && ! moptions(&options, auxpaths))
-               return((int)MANDOCLEVEL_BADARG);
+#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

 
 

-       curp.mchars = mchars_alloc();
-       curp.mp = mparse_alloc(options, curp.wlevel, mmsg,
-           curp.mchars, defos);
+       if (search.argmode == ARG_FILE)
+               moptions(&options, auxpaths);

 
 

-       /*
-        * Conditionally start up the lookaside buffer before parsing.
-        */
-       if (OUTT_MAN == curp.outtype)
-               mparse_keep(curp.mp);
+       mchars_alloc();
+       curp.mp = mparse_alloc(options, curp.mmin, mmsg,
+           curp.os_e, curp.os_s);

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

-               if (pager_pid == 1 && isatty(STDOUT_FILENO))
-                       pager_pid = spawn_pager();
+               if (use_pager)
+                       tag_files = tag_init();

                parse(&curp, STDIN_FILENO, "<stdin>");
        }
 
                parse(&curp, STDIN_FILENO, "<stdin>");
        }
 

+       /*
+        * Remember the original working directory, if possible.
+        * This will be needed if some names on the command line
+        * are page names and some are relative file names.
+        * Do not error out if the current directory is not
+        * readable: Maybe it won't be needed after all.
+        */
+       startdir = open(".", O_RDONLY | O_DIRECTORY);
+

        while (argc > 0) {
        while (argc > 0) {

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

 
 

+               /*
+                * 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);
+               }
+
+               fd = mparse_open(curp.mp, resp != NULL ? resp->file : *argv);

                if (fd != -1) {
                if (fd != -1) {

-                       if (pager_pid == 1 && isatty(STDOUT_FILENO))
-                               pager_pid = spawn_pager();
+                       if (use_pager) {
+                               tag_files = tag_init();
+                               use_pager = 0;
+                       }

 
                        if (resp == NULL)
                                parse(&curp, fd, *argv);
 
                        if (resp == NULL)
                                parse(&curp, fd, *argv);

-                       else if (resp->form & FORM_SRC) {
-                               /* For .so only; ignore failure. */
-                               chdir(conf.manpath.paths[resp->ipath]);
+                       else if (resp->form == FORM_SRC)

                                parse(&curp, fd, resp->file);
                                parse(&curp, fd, resp->file);

-                       } else
+                       else

                                passthrough(resp->file, fd,
                                    conf.output.synopsisonly);
 
                                passthrough(resp->file, fd,
                                    conf.output.synopsisonly);
 

-                       rctmp = mparse_wait(curp.mp);
-                       if (rc < rctmp)
-                               rc = rctmp;
+                       if (ferror(stdout)) {
+                               if (tag_files != NULL) {
+                                       warn("%s", tag_files->ofn);
+                                       tag_unlink();
+                                       tag_files = NULL;
+                               } else
+                                       warn("stdout");
+                               rc = MANDOCLEVEL_SYSERR;
+                               break;
+                       }

 
 

-                       if (argc > 1 && curp.outtype <= OUTT_UTF8)
-                               ascii_sepline(curp.outdata);
-               }
+                       if (argc > 1 && curp.outtype <= OUTT_UTF8) {
+                               if (curp.outdata == NULL)
+                                       outdata_alloc(&curp);
+                               terminal_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,37 +559,99 @@ main(int argc, char *argv[])
                if (--argc)
                        mparse_reset(curp.mp);
        }
                if (--argc)
                        mparse_reset(curp.mp);
        }

+       if (startdir != -1) {
+               (void)fchdir(startdir);
+               close(startdir);
+       }

 
 

-       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;
+               }
+       }
+       mandoc_xr_free();

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

-       mchars_free(curp.mchars);
+       mchars_free();

 
 out:
        if (search.argmode != ARG_FILE) {
                manconf_free(&conf);
 
 out:
        if (search.argmode != ARG_FILE) {
                manconf_free(&conf);

-#if HAVE_SQLITE3

                mansearch_free(res, sz);
                mansearch_free(res, sz);

-               mansearch_setup(0);
-#endif

        }
 
        }
 

-       free(defos);
+       free(curp.os_s);

 
        /*
 
        /*

-        * If a pager is attached, flush the pipe leading to it
-        * and signal end of file such that the user can browse
-        * to the end.  Then wait for the user to close the pager.
+        * When using a pager, finish writing both temporary files,
+        * fork it, wait for the user to close it, and clean up.

         */
 
         */
 

-       if (pager_pid != 0 && pager_pid != 1) {
+       if (tag_files != NULL) {

                fclose(stdout);
                tag_write();
                fclose(stdout);
                tag_write();

-               waitpid(pager_pid, 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(tag_files->ofd);
+                       if (tc_pgid != man_pgid) {
+                               if (tc_pgid == pager_pid) {
+                                       (void)tcsetpgrp(tag_files->ofd,
+                                           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(tag_files->ofd, 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();
        }
 

-       return((int)rc);
+       return (int)rc;

 }
 
 static void
 }
 
 static void


@@ -512,24 +660,22 @@ usage(enum argmode argmode)
 
        switch (argmode) {
        case ARG_FILE:
 
        switch (argmode) {
        case ARG_FILE:

-               fputs("usage: mandoc [-acfhkl] [-I os=name] "
-                   "[-K encoding] [-mformat] [-O option]\n"
+               fputs("usage: mandoc [-ac] [-I os=name] "
+                   "[-K encoding] [-mdoc | -man] [-O options]\n"

                    "\t      [-T output] [-W level] [file ...]\n", stderr);
                break;
        case ARG_NAME:
                    "\t      [-T output] [-W level] [file ...]\n", stderr);
                break;
        case ARG_NAME:

-               fputs("usage: man [-acfhklw] [-C file] [-I os=name] "
-                   "[-K encoding] [-M path] [-m path]\n"
-                   "\t   [-O option=value] [-S subsection] [-s section] "
-                   "[-T output] [-W level]\n"
-                   "\t   [section] name ...\n", stderr);
+               fputs("usage: man [-acfhklw] [-C file] [-M path] "
+                   "[-m path] [-S subsection]\n"
+                   "\t   [[-s] section] name ...\n", stderr);

                break;
        case ARG_WORD:
                break;
        case ARG_WORD:

-               fputs("usage: whatis [-acfhklw] [-C file] "
+               fputs("usage: whatis [-afk] [-C file] "

                    "[-M path] [-m path] [-O outkey] [-S arch]\n"
                    "\t      [-s section] name ...\n", stderr);
                break;
        case ARG_EXPR:
                    "[-M path] [-m path] [-O outkey] [-S arch]\n"
                    "\t      [-s section] name ...\n", stderr);
                break;
        case ARG_EXPR:

-               fputs("usage: apropos [-acfhklw] [-C file] "
+               fputs("usage: apropos [-afk] [-C file] "

                    "[-M path] [-m path] [-O outkey] [-S arch]\n"
                    "\t       [-s section] expression ...\n", stderr);
                break;
                    "[-M path] [-m path] [-O outkey] [-S arch]\n"
                    "\t       [-s section] expression ...\n", stderr);
                break;


@@ -545,7 +691,8 @@ fs_lookup(const struct manpaths *paths, size_t ipath,
        glob_t           globinfo;
        struct manpage  *page;
        char            *file;
        glob_t           globinfo;
        struct manpage  *page;
        char            *file;

-       int              form, globres;
+       int              globres;
+       enum form        form;

 
        form = FORM_SRC;
        mandoc_asprintf(&file, "%s/man%s/%s.%s",
 
        form = FORM_SRC;
        mandoc_asprintf(&file, "%s/man%s/%s.%s",


@@ -570,24 +717,32 @@ fs_lookup(const struct manpaths *paths, size_t ipath,
                free(file);
        }
 
                free(file);
        }
 

-       mandoc_asprintf(&file, "%s/man%s/%s.*",
+       mandoc_asprintf(&file, "%s/man%s/%s.[01-9]*",

            paths->paths[ipath], sec, name);
        globres = glob(file, 0, NULL, &globinfo);
        if (globres != 0 && globres != GLOB_NOMATCH)
            paths->paths[ipath], sec, name);
        globres = glob(file, 0, NULL, &globinfo);
        if (globres != 0 && globres != GLOB_NOMATCH)

-               fprintf(stderr, "%s: %s: glob: %s\n",
-                   progname, file, strerror(errno));
+               warn("%s: glob", file);

        free(file);
        if (globres == 0)
                file = mandoc_strdup(*globinfo.gl_pathv);
        globfree(&globinfo);
        free(file);
        if (globres == 0)
                file = mandoc_strdup(*globinfo.gl_pathv);
        globfree(&globinfo);

-       if (globres != 0)
-               return(0);
+       if (globres == 0)
+               goto found;
+       if (res != NULL || ipath + 1 != paths->sz)
+               return 0;
+
+       mandoc_asprintf(&file, "%s.%s", name, sec);
+       globres = access(file, R_OK);
+       free(file);
+       return globres != -1;

 
 found:
 
 found:

-#if HAVE_SQLITE3
-       fprintf(stderr, "%s: outdated mandoc.db lacks %s(%s) entry, run "
-           "makewhatis %s\n", progname, name, sec, paths->paths[ipath]);
-#endif
+       warnx("outdated mandoc.db lacks %s(%s) entry, run %s %s",
+           name, sec, BINM_MAKEWHATIS, paths->paths[ipath]);
+       if (res == NULL) {
+               free(file);
+               return 1;
+       }

        *res = mandoc_reallocarray(*res, ++*ressz, sizeof(struct manpage));
        page = *res + (*ressz - 1);
        page->file = file;
        *res = mandoc_reallocarray(*res, ++*ressz, sizeof(struct manpage));
        page = *res + (*ressz - 1);
        page->file = file;


@@ -597,22 +752,23 @@ found:
        page->bits = NAME_FILE & NAME_MASK;
        page->sec = (*sec >= '1' && *sec <= '9') ? *sec - '1' + 1 : 10;
        page->form = form;
        page->bits = NAME_FILE & NAME_MASK;
        page->sec = (*sec >= '1' && *sec <= '9') ? *sec - '1' + 1 : 10;
        page->form = form;

-       return(1);
+       return 1;

 }
 
 }
 

-static void
+static int

 fs_search(const struct mansearch *cfg, const struct manpaths *paths,
        int argc, char **argv, struct manpage **res, size_t *ressz)
 {
        const char *const sections[] =
 fs_search(const struct mansearch *cfg, const struct manpaths *paths,
        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;
 
        assert(cfg->argmode == ARG_NAME);
 
        const size_t nsec = sizeof(sections)/sizeof(sections[0]);
 
        size_t           ipath, isec, lastsz;
 
        assert(cfg->argmode == ARG_NAME);
 

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

        *ressz = lastsz = 0;
        while (argc) {
                for (ipath = 0; ipath < paths->sz; ipath++) {
        *ressz = lastsz = 0;
        while (argc) {
                for (ipath = 0; ipath < paths->sz; ipath++) {


@@ -620,21 +776,27 @@ fs_search(const struct mansearch *cfg, const struct manpaths *paths,
                                if (fs_lookup(paths, ipath, cfg->sec,
                                    cfg->arch, *argv, res, ressz) &&
                                    cfg->firstmatch)
                                if (fs_lookup(paths, ipath, cfg->sec,
                                    cfg->arch, *argv, res, ressz) &&
                                    cfg->firstmatch)

-                                       return;
+                                       return 1;

                        } else for (isec = 0; isec < nsec; isec++)
                                if (fs_lookup(paths, ipath, sections[isec],
                                    cfg->arch, *argv, res, ressz) &&
                                    cfg->firstmatch)
                        } else for (isec = 0; isec < nsec; isec++)
                                if (fs_lookup(paths, ipath, sections[isec],
                                    cfg->arch, *argv, res, ressz) &&
                                    cfg->firstmatch)

-                                       return;
+                                       return 1;
+               }
+               if (res != NULL && *ressz == lastsz &&
+                   strchr(*argv, '/') == NULL) {
+                       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);

                }
                }

-               if (*ressz == lastsz)
-                       fprintf(stderr,
-                           "%s: No entry for %s in the manual.\n",
-                           progname, *argv);

                lastsz = *ressz;
                argv++;
                argc--;
        }
                lastsz = *ressz;
                argv++;
                argc--;
        }

+       return 0;

 }
 
 static void
 }
 
 static void


@@ -646,9 +808,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;
 


@@ -660,84 +824,132 @@ parse(struct curparse *curp, int fd, const char *file)
        if (rctmp != MANDOCLEVEL_OK && curp->wstop)
                return;
 
        if (rctmp != MANDOCLEVEL_OK && curp->wstop)
                return;
 

-       /* If unset, allocate output dev now (if applicable). */
+       if (curp->outdata == NULL)
+               outdata_alloc(curp);
+
+       mparse_result(curp->mp, &man, NULL);

 
 

-       if ( ! (curp->outman && curp->outmdoc)) {
+       /* Execute the out device, if it exists. */
+
+       if (man == NULL)
+               return;
+       mandoc_xr_reset();
+       if (man->macroset == MACROSET_MDOC) {
+               if (curp->outtype != OUTT_TREE || !curp->outopts->noval)
+                       mdoc_validate(man);

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

-                       curp->outdata = html_alloc(curp->mchars,
-                           curp->outopts);
-                       curp->outfree = html_free;
+                       html_mdoc(curp->outdata, man);

                        break;
                        break;

-               case OUTT_UTF8:
-                       curp->outdata = utf8_alloc(curp->mchars,
-                           curp->outopts);
-                       curp->outfree = ascii_free;
-                       break;
-               case OUTT_LOCALE:
-                       curp->outdata = locale_alloc(curp->mchars,
-                           curp->outopts);
-                       curp->outfree = ascii_free;
+               case OUTT_TREE:
+                       tree_mdoc(curp->outdata, man);

                        break;
                        break;

-               case OUTT_ASCII:
-                       curp->outdata = ascii_alloc(curp->mchars,
-                           curp->outopts);
-                       curp->outfree = ascii_free;
+               case OUTT_MAN:
+                       man_mdoc(curp->outdata, man);

                        break;
                case OUTT_PDF:
                        break;
                case OUTT_PDF:

-                       curp->outdata = pdf_alloc(curp->mchars,
-                           curp->outopts);
-                       curp->outfree = pspdf_free;
-                       break;
+               case OUTT_ASCII:
+               case OUTT_UTF8:
+               case OUTT_LOCALE:

                case OUTT_PS:
                case OUTT_PS:

-                       curp->outdata = ps_alloc(curp->mchars,
-                           curp->outopts);
-                       curp->outfree = pspdf_free;
+                       terminal_mdoc(curp->outdata, man);
+                       break;
+               case OUTT_MARKDOWN:
+                       markdown_mdoc(curp->outdata, man);

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

-
+       }
+       if (man->macroset == MACROSET_MAN) {
+               if (curp->outtype != OUTT_TREE || !curp->outopts->noval)
+                       man_validate(man);

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

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

                        break;
                case OUTT_TREE:
                        break;
                case OUTT_TREE:

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

                        break;
                case OUTT_MAN:
                        break;
                case OUTT_MAN:

-                       curp->outmdoc = man_mdoc;
-                       curp->outman = man_man;
+                       mparse_copy(curp->mp);

                        break;
                case OUTT_PDF:
                        break;
                case OUTT_PDF:

-                       /* FALLTHROUGH */

                case OUTT_ASCII:
                case OUTT_ASCII:

-                       /* FALLTHROUGH */

                case OUTT_UTF8:
                case OUTT_UTF8:

-                       /* FALLTHROUGH */

                case OUTT_LOCALE:
                case OUTT_LOCALE:

-                       /* FALLTHROUGH */

                case OUTT_PS:
                case OUTT_PS:

-                       curp->outman = terminal_man;
-                       curp->outmdoc = terminal_mdoc;
+                       terminal_man(curp->outdata, man);

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

+       if (curp->mmin < MANDOCERR_STYLE)
+               check_xr(file);
+       mparse_updaterc(curp->mp, &rc);
+}

 
 

-       mparse_result(curp->mp, &man, NULL);
-
-       /* Execute the out device, if it exists. */
+static void
+check_xr(const char *file)
+{
+       static struct manpaths   paths;
+       struct mansearch         search;
+       struct mandoc_xr        *xr;
+       char                    *cp;
+       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;
+               search.arch = NULL;
+               search.sec = xr->sec;
+               search.outkey = NULL;
+               search.argmode = ARG_NAME;
+               search.firstmatch = 1;
+               if (mansearch(&search, &paths, 1, &xr->name, NULL, &sz))
+                       continue;
+               if (fs_search(&search, &paths, 1, &xr->name, NULL, &sz))
+                       continue;
+               if (xr->count == 1)
+                       mandoc_asprintf(&cp, "Xr %s %s", xr->name, xr->sec);
+               else
+                       mandoc_asprintf(&cp, "Xr %s %s (%d times)",
+                           xr->name, xr->sec, xr->count);
+               mmsg(MANDOCERR_XR_BAD, MANDOCLEVEL_STYLE,
+                   file, xr->line, xr->pos + 1, cp);
+               free(cp);
+       }
+}

 
 

-       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
+outdata_alloc(struct curparse *curp)
+{
+       switch (curp->outtype) {
+       case OUTT_HTML:
+               curp->outdata = html_alloc(curp->outopts);
+               break;
+       case OUTT_UTF8:
+               curp->outdata = utf8_alloc(curp->outopts);
+               break;
+       case OUTT_LOCALE:
+               curp->outdata = locale_alloc(curp->outopts);
+               break;
+       case OUTT_ASCII:
+               curp->outdata = ascii_alloc(curp->outopts);
+               break;
+       case OUTT_PDF:
+               curp->outdata = pdf_alloc(curp->outopts);
+               break;
+       case OUTT_PS:
+               curp->outdata = ps_alloc(curp->outopts);
+               break;
+       default:
+               break;
+       }

 }
 
 static void
 }
 
 static void


@@ -748,12 +960,18 @@ 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;
+       ssize_t          len, written;

        int              print;
 
        int              print;
 

-       fflush(stdout);
+       line = NULL;
+       linesz = 0;
+
+       if (fflush(stdout) == EOF) {
+               syscall = "fflush";
+               goto fail;
+       }

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


@@ -762,47 +980,46 @@ passthrough(const char *file, int fd, int synopsis_only)
        }
 
        print = 0;
        }
 
        print = 0;

-       while ((line = fgetln(stream, &len)) != NULL) {
+       while ((len = 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++;
+                               while (isspace((unsigned char)*cp)) {
+                                       cp++;

                                        len--;
                                }
                        } else {
                                        len--;
                                }
                        } 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;
-                       }
+               for (; len > 0; len -= written) {
+                       if ((written = write(STDOUT_FILENO, cp, len)) != -1)
+                               continue;
+                       fclose(stream);
+                       syscall = "write";
+                       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:

-       fprintf(stderr, "%s: %s: SYSERR: %s: %s",
-           progname, file, syscall, strerror(errno));
+       free(line);
+       warn("%s: SYSERR: %s", file, syscall);

        if (rc < MANDOCLEVEL_SYSERR)
                rc = MANDOCLEVEL_SYSERR;
 }
        if (rc < MANDOCLEVEL_SYSERR)
                rc = MANDOCLEVEL_SYSERR;
 }


@@ -820,32 +1037,22 @@ koptions(int *options, char *arg)
        } else if ( ! strcmp(arg, "us-ascii")) {
                *options &= ~(MPARSE_UTF8 | MPARSE_LATIN1);
        } else {
        } else if ( ! strcmp(arg, "us-ascii")) {
                *options &= ~(MPARSE_UTF8 | MPARSE_LATIN1);
        } else {

-               fprintf(stderr, "%s: -K %s: Bad argument\n",
-                   progname, arg);
-               return(0);
+               warnx("-K %s: Bad argument", arg);
+               return 0;

        }
        }

-       return(1);
+       return 1;

 }
 
 }
 

-static int
+static void

 moptions(int *options, char *arg)
 {
 
        if (arg == NULL)
 moptions(int *options, char *arg)
 {
 
        if (arg == NULL)

-               /* nothing to do */;
-       else if (0 == strcmp(arg, "doc"))
+               return;
+       if (strcmp(arg, "doc") == 0)

                *options |= MPARSE_MDOC;
                *options |= MPARSE_MDOC;

-       else if (0 == strcmp(arg, "andoc"))
-               /* nothing to do */;
-       else if (0 == strcmp(arg, "an"))
+       else if (strcmp(arg, "an") == 0)

                *options |= MPARSE_MAN;
                *options |= MPARSE_MAN;

-       else {
-               fprintf(stderr, "%s: -m %s: Bad argument\n",
-                   progname, arg);
-               return(0);
-       }
-
-       return(1);

 }
 
 static int
 }
 
 static int


@@ -856,74 +1063,89 @@ toptions(struct curparse *curp, char *arg)
                curp->outtype = OUTT_ASCII;
        else if (0 == strcmp(arg, "lint")) {
                curp->outtype = OUTT_LINT;
                curp->outtype = OUTT_ASCII;
        else if (0 == strcmp(arg, "lint")) {
                curp->outtype = OUTT_LINT;

-               curp->wlevel  = MANDOCLEVEL_WARNING;
+               curp->mmin = MANDOCERR_BASE;
+               mmsg_stream = stdout;

        } else if (0 == strcmp(arg, "tree"))
                curp->outtype = OUTT_TREE;
        else if (0 == strcmp(arg, "man"))
                curp->outtype = OUTT_MAN;
        else if (0 == strcmp(arg, "html"))
                curp->outtype = OUTT_HTML;
        } else if (0 == strcmp(arg, "tree"))
                curp->outtype = OUTT_TREE;
        else if (0 == strcmp(arg, "man"))
                curp->outtype = OUTT_MAN;
        else if (0 == strcmp(arg, "html"))
                curp->outtype = OUTT_HTML;

+       else if (0 == strcmp(arg, "markdown"))
+               curp->outtype = OUTT_MARKDOWN;

        else if (0 == strcmp(arg, "utf8"))
                curp->outtype = OUTT_UTF8;
        else if (0 == strcmp(arg, "locale"))
                curp->outtype = OUTT_LOCALE;
        else if (0 == strcmp(arg, "utf8"))
                curp->outtype = OUTT_UTF8;
        else if (0 == strcmp(arg, "locale"))
                curp->outtype = OUTT_LOCALE;

-       else if (0 == strcmp(arg, "xhtml"))
-               curp->outtype = OUTT_HTML;

        else if (0 == strcmp(arg, "ps"))
                curp->outtype = OUTT_PS;
        else if (0 == strcmp(arg, "pdf"))
                curp->outtype = OUTT_PDF;
        else {
        else if (0 == strcmp(arg, "ps"))
                curp->outtype = OUTT_PS;
        else if (0 == strcmp(arg, "pdf"))
                curp->outtype = OUTT_PDF;
        else {

-               fprintf(stderr, "%s: -T %s: Bad argument\n",
-                   progname, arg);
-               return(0);
+               warnx("-T %s: Bad argument", arg);
+               return 0;

        }
 
        }
 

-       return(1);
+       return 1;

 }
 
 static int
 woptions(struct curparse *curp, char *arg)
 {
        char            *v, *o;
 }
 
 static int
 woptions(struct curparse *curp, char *arg)
 {
        char            *v, *o;

-       const char      *toks[7];
+       const char      *toks[11];

 
        toks[0] = "stop";
        toks[1] = "all";
 
        toks[0] = "stop";
        toks[1] = "all";

-       toks[2] = "warning";
-       toks[3] = "error";
-       toks[4] = "unsupp";
-       toks[5] = "fatal";
-       toks[6] = NULL;
+       toks[2] = "base";
+       toks[3] = "style";
+       toks[4] = "warning";
+       toks[5] = "error";
+       toks[6] = "unsupp";
+       toks[7] = "fatal";
+       toks[8] = "openbsd";
+       toks[9] = "netbsd";
+       toks[10] = NULL;

 
        while (*arg) {
                o = arg;
 
        while (*arg) {
                o = arg;

-               switch (getsubopt(&arg, UNCONST(toks), &v)) {
+               switch (getsubopt(&arg, (char * const *)toks, &v)) {

                case 0:
                        curp->wstop = 1;
                        break;
                case 1:
                case 0:
                        curp->wstop = 1;
                        break;
                case 1:

-                       /* FALLTHROUGH */

                case 2:
                case 2:

-                       curp->wlevel = MANDOCLEVEL_WARNING;
+                       curp->mmin = MANDOCERR_BASE;

                        break;
                case 3:
                        break;
                case 3:

-                       curp->wlevel = MANDOCLEVEL_ERROR;
+                       curp->mmin = MANDOCERR_STYLE;

                        break;
                case 4:
                        break;
                case 4:

-                       curp->wlevel = MANDOCLEVEL_UNSUPP;
+                       curp->mmin = MANDOCERR_WARNING;

                        break;
                case 5:
                        break;
                case 5:

-                       curp->wlevel = MANDOCLEVEL_BADARG;
+                       curp->mmin = MANDOCERR_ERROR;
+                       break;
+               case 6:
+                       curp->mmin = MANDOCERR_UNSUPP;
+                       break;
+               case 7:
+                       curp->mmin = MANDOCERR_MAX;
+                       break;
+               case 8:
+                       curp->mmin = MANDOCERR_BASE;
+                       curp->os_e = MANDOC_OS_OPENBSD;
+                       break;
+               case 9:
+                       curp->mmin = MANDOCERR_BASE;
+                       curp->os_e = MANDOC_OS_NETBSD;

                        break;
                default:
                        break;
                default:

-                       fprintf(stderr, "%s: -W %s: Bad argument\n",
-                           progname, o);
-                       return(0);
+                       warnx("-W %s: Bad argument", o);
+                       return 0;

                }
        }
                }
        }

-
-       return(1);
+       return 1;

 }
 
 static void
 }
 
 static void


@@ -932,38 +1154,32 @@ mmsg(enum mandocerr t, enum mandoclevel lvl,
 {
        const char      *mparse_msg;
 
 {
        const char      *mparse_msg;
 

-       fprintf(stderr, "%s: %s:", progname, file);
+       fprintf(mmsg_stream, "%s: %s:", getprogname(),
+           file == NULL ? "<stdin>" : file);

 
        if (line)
 
        if (line)

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

 
 

-       fprintf(stderr, " %s", mparse_strlevel(lvl));
+       fprintf(mmsg_stream, " %s", mparse_strlevel(lvl));

 
 

-       if (NULL != (mparse_msg = mparse_strerror(t)))
-               fprintf(stderr, ": %s", mparse_msg);
+       if ((mparse_msg = mparse_strerror(t)) != NULL)
+               fprintf(mmsg_stream, ": %s", mparse_msg);

 
        if (msg)
 
        if (msg)

-               fprintf(stderr, ": %s", msg);
+               fprintf(mmsg_stream, ": %s", msg);

 
 

-       fputc('\n', stderr);
-}
-
-static void
-handle_sigpipe(int signum)
-{
-
-       exit((int)rc);
+       fputc('\n', mmsg_stream);

 }
 
 static pid_t
 }
 
 static pid_t

-spawn_pager(void)
+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;
        char            *cp;
        size_t           cmdlen;
 #define MAX_PAGER_ARGS 16
        char            *argv[MAX_PAGER_ARGS];
        const char      *pager;
        char            *cp;
        size_t           cmdlen;

-       int              fildes[2];

        int              argc;
        pid_t            pager_pid;
 
        int              argc;
        pid_t            pager_pid;
 


@@ -992,59 +1208,46 @@ spawn_pager(void)
                        break;
        }
 
                        break;
        }
 

-       /* Read all text right away and use the tag file. */
+       /* For less(1), use the tag file. */

 
        if ((cmdlen = strlen(argv[0])) >= 4) {
                cp = argv[0] + cmdlen - 4;
 
        if ((cmdlen = strlen(argv[0])) >= 4) {
                cp = argv[0] + cmdlen - 4;

-               if (strcmp(cp, "less") == 0 ||
-                   strcmp(cp, "more") == 0) {
-                       tag_init();
-                       argv[argc++] = mandoc_strdup("+G1G");
+               if (strcmp(cp, "less") == 0) {

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

-                       argv[argc++] = tag_filename();
+                       argv[argc++] = tag_files->tfn;

                }
        }
                }
        }

+       argv[argc++] = tag_files->ofn;

        argv[argc] = NULL;
 
        argv[argc] = NULL;
 

-       if (pipe(fildes) == -1) {
-               fprintf(stderr, "%s: pipe: %s\n",
-                   progname, strerror(errno));
-               return(0);
-       }
-

        switch (pager_pid = fork()) {
        case -1:
        switch (pager_pid = fork()) {
        case -1:

-               fprintf(stderr, "%s: fork: %s\n",
-                   progname, strerror(errno));
-               exit((int)MANDOCLEVEL_SYSERR);
+               err((int)MANDOCLEVEL_SYSERR, "fork");

        case 0:
                break;
        default:
        case 0:
                break;
        default:

-               close(fildes[0]);
-               if (dup2(fildes[1], STDOUT_FILENO) == -1) {
-                       fprintf(stderr, "%s: dup output: %s\n",
-                           progname, strerror(errno));
-                       exit((int)MANDOCLEVEL_SYSERR);
-               }
-               close(fildes[1]);
-               signal(SIGPIPE, handle_sigpipe);
-               return(pager_pid);
+               (void)setpgid(pager_pid, 0);
+               (void)tcsetpgrp(tag_files->ofd, 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;

        }
 
        /* The child process becomes the pager. */
 
        }
 
        /* The child process becomes the pager. */
 

-       close(fildes[1]);
-       if (dup2(fildes[0], STDIN_FILENO) == -1) {
-               fprintf(stderr, "%s: dup input: %s\n",
-                   progname, strerror(errno));
-               exit((int)MANDOCLEVEL_SYSERR);
-       }
-       close(fildes[0]);
+       if (dup2(tag_files->ofd, STDOUT_FILENO) == -1)
+               err((int)MANDOCLEVEL_SYSERR, "pager stdout");
+       close(tag_files->ofd);
+       assert(tag_files->tfd == -1);
+
+       /* Do not start the pager before controlling the terminal. */

 
 

-       /* Hand over to the pager. */
+       while (tcgetpgrp(STDOUT_FILENO) != getpid())
+               nanosleep(&timeout, NULL);

 
        execvp(argv[0], argv);
 
        execvp(argv[0], argv);

-       fprintf(stderr, "%s: exec %s: %s\n",
-           progname, argv[0], strerror(errno));
-       exit((int)MANDOCLEVEL_SYSERR);
+       err((int)MANDOCLEVEL_SYSERR, "exec %s", argv[0]);

 }
 }