]> git.cameronkatri.com Git - mandoc.git/blobdiff - main.c
git.ckatri.com / mandoc.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
add missing HISTORY information
[mandoc.git] / main.c
diff --git a/main.c b/main.c
index 9eee9aeaff320d21939248e5cc57087cc94089e0..1b1b5b73a11a8c1b16a85cf709affcd88c35927c 100644 (file)
--- a/main.c
+++ b/main.c
@@ -1,554 +1,933 @@
-/*     $Id: main.c,v 1.62 2010/05/09 21:19:42 kristaps Exp $ */
+/*     $Id: main.c,v 1.280 2017/01/27 13:47:10 schwarze Exp $ */
 /*
 /*
- * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
+ * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2010-2012, 2014-2017 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2010 Joerg Sonnenberger <joerg@netbsd.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
  *
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
  *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHORS DISCLAIM ALL WARRANTIES
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR
  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * 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.
  */
  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * 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.
  */
-#ifdef HAVE_CONFIG_H
 #include "config.h"
 #include "config.h"
-#endif
 
 
-#include <sys/stat.h>
+#include <sys/types.h>
+#include <sys/param.h> /* MACHINE */
+#include <sys/wait.h>
 
 #include <assert.h>
 
 #include <assert.h>
+#include <ctype.h>
+#if HAVE_ERR
+#include <err.h>
+#endif
+#include <errno.h>
 #include <fcntl.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 <stdio.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
+#include <time.h>
 #include <unistd.h>
 
 #include <unistd.h>
 
+#include "mandoc_aux.h"
+#include "mandoc.h"
+#include "roff.h"
 #include "mdoc.h"
 #include "man.h"
 #include "mdoc.h"
 #include "man.h"
+#include "tag.h"
 #include "main.h"
 #include "main.h"
-
-#define        UNCONST(a)      ((void *)(uintptr_t)(const void *)(a))
-
-/* FIXME: Intel's compiler?  LLVM?  pcc?  */
-
-#if !defined(__GNUC__) || (__GNUC__ < 2)
-# if !defined(lint)
-#  define __attribute__(x)
-# endif
-#endif /* !defined(__GNUC__) || (__GNUC__ < 2) */
-
-typedef        void            (*out_mdoc)(void *, const struct mdoc *);
-typedef        void            (*out_man)(void *, const struct man *);
-typedef        void            (*out_free)(void *);
-
-struct buf {
-       char             *buf;
-       size_t            sz;
-};
-
-enum   intt {
-       INTT_AUTO,
-       INTT_MDOC,
-       INTT_MAN
+#include "manconf.h"
+#include "mansearch.h"
+
+enum   outmode {
+       OUTMODE_DEF = 0,
+       OUTMODE_FLN,
+       OUTMODE_LST,
+       OUTMODE_ALL,
+       OUTMODE_INT,
+       OUTMODE_ONE
 };
 
 enum   outt {
 };
 
 enum   outt {
-       OUTT_ASCII = 0,
-       OUTT_TREE,
-       OUTT_HTML,
-       OUTT_XHTML,
-       OUTT_LINT
+       OUTT_ASCII = 0, /* -Tascii */
+       OUTT_LOCALE,    /* -Tlocale */
+       OUTT_UTF8,      /* -Tutf8 */
+       OUTT_TREE,      /* -Ttree */
+       OUTT_MAN,       /* -Tman */
+       OUTT_HTML,      /* -Thtml */
+       OUTT_LINT,      /* -Tlint */
+       OUTT_PS,        /* -Tps */
+       OUTT_PDF        /* -Tpdf */
 };
 
 struct curparse {
 };
 
 struct curparse {
-       const char       *file;         /* Current parse. */
-       int               fd;           /* Current parse. */
-       int               wflags;
-#define        WARN_WALL        (1 << 0)       /* All-warnings mask. */
-#define        WARN_WERR        (1 << 2)       /* Warnings->errors. */
-       int               fflags;
-#define        FL_IGN_SCOPE     (1 << 0)       /* Ignore scope errors. */
-#define        FL_NIGN_ESCAPE   (1 << 1)       /* Don't ignore bad escapes. */
-#define        FL_NIGN_MACRO    (1 << 2)       /* Don't ignore bad macros. */
-#define        FL_IGN_ERRORS    (1 << 4)       /* Ignore failed parse. */
-       enum intt         inttype;      /* Input parsers... */
-       struct man       *man;
-       struct man       *lastman;
-       struct mdoc      *mdoc;
-       struct mdoc      *lastmdoc;
-       enum outt         outtype;      /* Output devices... */
-       out_mdoc          outmdoc;
-       out_man           outman;
-       out_free          outfree;
-       void             *outdata;
-       char              outopts[BUFSIZ];
+       struct mparse    *mp;
+       enum mandoclevel  wlevel;       /* ignore messages below this */
+       int               wstop;        /* stop after a file with a warning */
+       enum outt         outtype;      /* which output to use */
+       void             *outdata;      /* data for output */
+       struct manoutput *outopts;      /* output options */
 };
 
 };
 
-#define        FL_STRICT         FL_NIGN_ESCAPE | \
-                         FL_NIGN_MACRO
 
 
-static int               foptions(int *, char *);
+int                      mandocdb(int, char *[]);
+
+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 *,
+                               const struct manpaths *, int, char**,
+                               struct manpage **, size_t *);
+static int               koptions(int *, char *);
+static int               moptions(int *, 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 pid_t             spawn_pager(struct tag_files *);
 static int               toptions(struct curparse *, char *);
 static int               toptions(struct curparse *, char *);
-static int               moptions(enum intt *, char *);
-static int               woptions(int *, char *);
-static int               merr(void *, int, int, const char *);
-static int               mwarn(void *, int, int, const char *);
-static int               ffile(struct buf *, struct buf *, 
-                               const char *, struct curparse *);
-static int               fdesc(struct buf *, struct buf *,
-                               struct curparse *);
-static int               pset(const char *, int, struct curparse *,
-                               struct man **, struct mdoc **);
-static struct man       *man_init(struct curparse *);
-static struct mdoc      *mdoc_init(struct curparse *);
-static void              version(void) __attribute__((noreturn));
-static void              usage(void) __attribute__((noreturn));
-
-static const char       *progname;
+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 enum mandoclevel  rc;
 
 
 int
 main(int argc, char *argv[])
 {
 
 
 int
 main(int argc, char *argv[])
 {
-       int              c, rc;
-       struct buf       ln, blk;
+       struct manconf   conf;
        struct curparse  curp;
        struct curparse  curp;
-
-       progname = strrchr(argv[0], '/');
-       if (progname == NULL)
+       struct mansearch search;
+       struct tag_files *tag_files;
+       const char      *progname;
+       char            *auxpaths;
+       char            *defos;
+       unsigned char   *uc;
+       struct manpage  *res, *resp;
+       char            *conf_file, *defpaths;
+       const char      *sec;
+       const char      *thisarg;
+       size_t           i, sz;
+       int              prio, best_prio;
+       enum outmode     outmode;
+       int              fd;
+       int              show_usage;
+       int              options;
+       int              use_pager;
+       int              status, signum;
+       int              c;
+       pid_t            pager_pid, tc_pgid, man_pgid, pid;
+
+#if HAVE_PROGNAME
+       progname = getprogname();
+#else
+       if (argc < 1)
+               progname = mandoc_strdup("mandoc");
+       else if ((progname = strrchr(argv[0], '/')) == NULL)
                progname = argv[0];
        else
                ++progname;
                progname = argv[0];
        else
                ++progname;
+       setprogname(progname);
+#endif
 
 
-       memset(&curp, 0, sizeof(struct curparse));
+       if (strncmp(progname, "mandocdb", 8) == 0 ||
+           strcmp(progname, BINM_MAKEWHATIS) == 0)
+               return mandocdb(argc, argv);
 
 
-       curp.inttype = INTT_AUTO;
-       curp.outtype = OUTT_ASCII;
+#if HAVE_PLEDGE
+       if (pledge("stdio rpath tmppath tty proc exec flock", 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. */
+
+       memset(&conf, 0, sizeof(conf));
+       conf_file = defpaths = NULL;
+       auxpaths = NULL;
+
+       memset(&search, 0, sizeof(struct mansearch));
+       search.outkey = "Nd";
+
+       if (strcmp(progname, BINM_MAN) == 0)
+               search.argmode = ARG_NAME;
+       else if (strcmp(progname, BINM_APROPOS) == 0)
+               search.argmode = ARG_EXPR;
+       else if (strcmp(progname, BINM_WHATIS) == 0)
+               search.argmode = ARG_WORD;
+       else if (strncmp(progname, "help", 4) == 0)
+               search.argmode = ARG_NAME;
+       else
+               search.argmode = ARG_FILE;
 
 
-       /* LINTED */
-       while (-1 != (c = getopt(argc, argv, "f:m:O:T:VW:")))
+       /* Parser and formatter options. */
+
+       memset(&curp, 0, sizeof(struct curparse));
+       curp.outtype = OUTT_LOCALE;
+       curp.wlevel  = MANDOCLEVEL_BADARG;
+       curp.outopts = &conf.output;
+       options = MPARSE_SO | MPARSE_UTF8 | MPARSE_LATIN1;
+       defos = NULL;
+
+       use_pager = 1;
+       tag_files = NULL;
+       show_usage = 0;
+       outmode = OUTMODE_DEF;
+
+       while (-1 != (c = getopt(argc, argv,
+                       "aC:cfhI:iK:klM:m:O:S:s:T:VW:w"))) {
                switch (c) {
                switch (c) {
-               case ('f'):
-                       if ( ! foptions(&curp.fflags, optarg))
-                               return(EXIT_FAILURE);
+               case 'a':
+                       outmode = OUTMODE_ALL;
+                       break;
+               case 'C':
+                       conf_file = optarg;
+                       break;
+               case 'c':
+                       use_pager = 0;
                        break;
                        break;
-               case ('m'):
-                       if ( ! moptions(&curp.inttype, optarg))
-                               return(EXIT_FAILURE);
+               case 'f':
+                       search.argmode = ARG_WORD;
                        break;
                        break;
-               case ('O'):
-                       (void)strlcat(curp.outopts, optarg, BUFSIZ);
-                       (void)strlcat(curp.outopts, ",", BUFSIZ);
+               case 'h':
+                       conf.output.synopsisonly = 1;
+                       use_pager = 0;
+                       outmode = OUTMODE_ALL;
+                       break;
+               case 'I':
+                       if (strncmp(optarg, "os=", 3)) {
+                               warnx("-I %s: Bad argument", optarg);
+                               return (int)MANDOCLEVEL_BADARG;
+                       }
+                       if (defos) {
+                               warnx("-I %s: Duplicate argument", optarg);
+                               return (int)MANDOCLEVEL_BADARG;
+                       }
+                       defos = mandoc_strdup(optarg + 3);
                        break;
                        break;
-               case ('T'):
+               case 'i':
+                       outmode = OUTMODE_INT;
+                       break;
+               case 'K':
+                       if ( ! koptions(&options, optarg))
+                               return (int)MANDOCLEVEL_BADARG;
+                       break;
+               case 'k':
+                       search.argmode = ARG_EXPR;
+                       break;
+               case 'l':
+                       search.argmode = ARG_FILE;
+                       outmode = OUTMODE_ALL;
+                       break;
+               case 'M':
+                       defpaths = optarg;
+                       break;
+               case 'm':
+                       auxpaths = optarg;
+                       break;
+               case 'O':
+                       search.outkey = optarg;
+                       while (optarg != NULL) {
+                               thisarg = optarg;
+                               if (manconf_output(&conf.output,
+                                   strsep(&optarg, ","), 0) == 0)
+                                       continue;
+                               warnx("-O %s: Bad argument", thisarg);
+                               return (int)MANDOCLEVEL_BADARG;
+                       }
+                       break;
+               case 'S':
+                       search.arch = optarg;
+                       break;
+               case 's':
+                       search.sec = optarg;
+                       break;
+               case 'T':
                        if ( ! toptions(&curp, optarg))
                        if ( ! toptions(&curp, optarg))
-                               return(EXIT_FAILURE);
+                               return (int)MANDOCLEVEL_BADARG;
+                       break;
+               case 'W':
+                       if ( ! woptions(&curp, optarg))
+                               return (int)MANDOCLEVEL_BADARG;
                        break;
                        break;
-               case ('W'):
-                       if ( ! woptions(&curp.wflags, optarg))
-                               return(EXIT_FAILURE);
+               case 'w':
+                       outmode = OUTMODE_FLN;
                        break;
                        break;
-               case ('V'):
-                       version();
-                       /* NOTREACHED */
                default:
                default:
-                       usage();
-                       /* NOTREACHED */
+                       show_usage = 1;
+                       break;
                }
                }
+       }
 
 
-       argc -= optind;
-       argv += optind;
+       if (show_usage)
+               usage(search.argmode);
 
 
-       memset(&ln, 0, sizeof(struct buf));
-       memset(&blk, 0, sizeof(struct buf));
+       /* Postprocess options. */
 
 
-       rc = 1;
+       if (outmode == OUTMODE_DEF) {
+               switch (search.argmode) {
+               case ARG_FILE:
+                       outmode = OUTMODE_ALL;
+                       use_pager = 0;
+                       break;
+               case ARG_NAME:
+                       outmode = OUTMODE_ONE;
+                       break;
+               default:
+                       outmode = OUTMODE_LST;
+                       break;
+               }
+       }
 
 
-       if (NULL == *argv) {
-               curp.file = "<stdin>";
-               curp.fd = STDIN_FILENO;
+       if (outmode == OUTMODE_FLN ||
+           outmode == OUTMODE_LST ||
+           !isatty(STDOUT_FILENO))
+               use_pager = 0;
 
 
-               c = fdesc(&blk, &ln, &curp);
-               if ( ! (FL_IGN_ERRORS & curp.fflags)) 
-                       rc = 1 == c ? 1 : 0;
-               else
-                       rc = -1 == c ? 0 : 1;
-       }
+#if HAVE_PLEDGE
+       if (!use_pager)
+               if (pledge("stdio rpath flock", NULL) == -1)
+                       err((int)MANDOCLEVEL_SYSERR, "pledge");
+#endif
 
 
-       while (rc && *argv) {
-               c = ffile(&blk, &ln, *argv, &curp);
-               if ( ! (FL_IGN_ERRORS & curp.fflags)) 
-                       rc = 1 == c ? 1 : 0;
-               else
-                       rc = -1 == c ? 0 : 1;
+       /* Parse arguments. */
 
 
-               argv++;
-               if (*argv && rc) {
-                       if (curp.lastman)
-                               man_reset(curp.lastman);
-                       if (curp.lastmdoc)
-                               mdoc_reset(curp.lastmdoc);
-                       curp.lastman = NULL;
-                       curp.lastmdoc = NULL;
-               }
+       if (argc > 0) {
+               argc -= optind;
+               argv += optind;
        }
        }
+       resp = NULL;
 
 
-       if (blk.buf)
-               free(blk.buf);
-       if (ln.buf)
-               free(ln.buf);
-       if (curp.outfree)
-               (*curp.outfree)(curp.outdata);
-       if (curp.mdoc)
-               mdoc_free(curp.mdoc);
-       if (curp.man)
-               man_free(curp.man);
-
-       return(rc ? EXIT_SUCCESS : EXIT_FAILURE);
-}
+       /*
+        * Quirks for help(1)
+        * and for a man(1) section argument without -s.
+        */
 
 
+       if (search.argmode == ARG_NAME) {
+               if (*progname == 'h') {
+                       if (argc == 0) {
+                               argv = help_argv;
+                               argc = 1;
+                       }
+               } else if (argc > 1 &&
+                   ((uc = (unsigned char *)argv[0]) != NULL) &&
+                   ((isdigit(uc[0]) && (uc[1] == '\0' ||
+                     (isalpha(uc[1]) && uc[2] == '\0'))) ||
+                    (uc[0] == 'n' && uc[1] == '\0'))) {
+                       search.sec = (char *)uc;
+                       argv++;
+                       argc--;
+               }
+               if (search.arch == NULL)
+                       search.arch = getenv("MACHINE");
+#ifdef MACHINE
+               if (search.arch == NULL)
+                       search.arch = MACHINE;
+#endif
+       }
 
 
-static void
-version(void)
-{
+       rc = MANDOCLEVEL_OK;
 
 
-       (void)printf("%s %s\n", progname, VERSION);
-       exit(EXIT_SUCCESS);
-}
+       /* man(1), whatis(1), apropos(1) */
 
 
+       if (search.argmode != ARG_FILE) {
+               if (search.argmode == ARG_NAME &&
+                   outmode == OUTMODE_ONE)
+                       search.firstmatch = 1;
 
 
-static void
-usage(void)
-{
+               /* Access the mandoc database. */
 
 
-       (void)fprintf(stderr, "usage: %s [-V] [-foption] "
-                       "[-mformat] [-Ooption] [-Toutput] "
-                       "[-Werr] [file...]\n", progname);
-       exit(EXIT_FAILURE);
-}
+               manconf_parse(&conf, conf_file, defpaths, auxpaths);
+               if ( ! mansearch(&search, &conf.manpath,
+                   argc, argv, &res, &sz))
+                       usage(search.argmode);
 
 
+               if (sz == 0) {
+                       if (search.argmode == ARG_NAME)
+                               fs_search(&search, &conf.manpath,
+                                   argc, argv, &res, &sz);
+                       else
+                               warnx("nothing appropriate");
+               }
 
 
-static struct man *
-man_init(struct curparse *curp)
-{
-       int              pflags;
-       struct man_cb    mancb;
+               if (sz == 0) {
+                       rc = MANDOCLEVEL_BADARG;
+                       goto out;
+               }
 
 
-       mancb.man_err = merr;
-       mancb.man_warn = mwarn;
+               /*
+                * 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 = 20;
+               } 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;
+                               sec += strcspn(sec, "123456789");
+                               if (sec[0] == '\0')
+                                       continue;
+                               prio = sec_prios[sec[0] - '1'];
+                               if (sec[1] != '/')
+                                       prio += 10;
+                               if (prio >= best_prio)
+                                       continue;
+                               best_prio = prio;
+                               resp = res + i;
+                       }
+               }
 
 
-       /* Defaults from mandoc.1. */
+               /*
+                * 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.
+                */
 
 
-       pflags = MAN_IGN_MACRO | MAN_IGN_ESCAPE;
+               if (outmode == OUTMODE_FLN || outmode == OUTMODE_LST)
+                       goto out;
+       }
 
 
-       if (curp->fflags & FL_NIGN_MACRO)
-               pflags &= ~MAN_IGN_MACRO;
-       if (curp->fflags & FL_NIGN_ESCAPE)
-               pflags &= ~MAN_IGN_ESCAPE;
+       /* mandoc(1) */
 
 
-       return(man_alloc(curp, pflags, &mancb));
-}
+#if HAVE_PLEDGE
+       if (use_pager) {
+               if (pledge("stdio rpath tmppath tty proc exec", NULL) == -1)
+                       err((int)MANDOCLEVEL_SYSERR, "pledge");
+       } else {
+               if (pledge("stdio rpath", NULL) == -1)
+                       err((int)MANDOCLEVEL_SYSERR, "pledge");
+       }
+#endif
 
 
+       if (search.argmode == ARG_FILE && ! moptions(&options, auxpaths))
+               return (int)MANDOCLEVEL_BADARG;
 
 
-static struct mdoc *
-mdoc_init(struct curparse *curp)
-{
-       int              pflags;
-       struct mdoc_cb   mdoccb;
+       mchars_alloc();
+       curp.mp = mparse_alloc(options, curp.wlevel, mmsg, defos);
 
 
-       mdoccb.mdoc_err = merr;
-       mdoccb.mdoc_warn = mwarn;
+       /*
+        * Conditionally start up the lookaside buffer before parsing.
+        */
+       if (OUTT_MAN == curp.outtype)
+               mparse_keep(curp.mp);
 
 
-       /* Defaults from mandoc.1. */
+       if (argc < 1) {
+               if (use_pager)
+                       tag_files = tag_init();
+               parse(&curp, STDIN_FILENO, "<stdin>");
+       }
 
 
-       pflags = MDOC_IGN_MACRO | MDOC_IGN_ESCAPE;
+       while (argc > 0) {
+               fd = mparse_open(curp.mp, resp != NULL ? resp->file : *argv);
+               if (fd != -1) {
+                       if (use_pager) {
+                               tag_files = tag_init();
+                               use_pager = 0;
+                       }
 
 
-       if (curp->fflags & FL_IGN_SCOPE)
-               pflags |= MDOC_IGN_SCOPE;
-       if (curp->fflags & FL_NIGN_ESCAPE)
-               pflags &= ~MDOC_IGN_ESCAPE;
-       if (curp->fflags & FL_NIGN_MACRO)
-               pflags &= ~MDOC_IGN_MACRO;
+                       if (resp == NULL)
+                               parse(&curp, fd, *argv);
+                       else if (resp->form == FORM_SRC) {
+                               /* For .so only; ignore failure. */
+                               chdir(conf.manpath.paths[resp->ipath]);
+                               parse(&curp, fd, resp->file);
+                       } else
+                               passthrough(resp->file, fd,
+                                   conf.output.synopsisonly);
+
+                       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;
 
 
-       return(mdoc_alloc(curp, pflags, &mdoccb));
-}
+               if (MANDOCLEVEL_OK != rc && curp.wstop)
+                       break;
 
 
+               if (resp != NULL)
+                       resp++;
+               else
+                       argv++;
+               if (--argc)
+                       mparse_reset(curp.mp);
+       }
 
 
-static int
-ffile(struct buf *blk, struct buf *ln, 
-               const char *file, struct curparse *curp)
-{
-       int              c;
+       if (curp.outdata != NULL) {
+               switch (curp.outtype) {
+               case OUTT_HTML:
+                       html_free(curp.outdata);
+                       break;
+               case OUTT_UTF8:
+               case OUTT_LOCALE:
+               case OUTT_ASCII:
+                       ascii_free(curp.outdata);
+                       break;
+               case OUTT_PDF:
+               case OUTT_PS:
+                       pspdf_free(curp.outdata);
+                       break;
+               default:
+                       break;
+               }
+       }
+       mparse_free(curp.mp);
+       mchars_free();
 
 
-       curp->file = file;
-       if (-1 == (curp->fd = open(curp->file, O_RDONLY, 0))) {
-               perror(curp->file);
-               return(-1);
+out:
+       if (search.argmode != ARG_FILE) {
+               manconf_free(&conf);
+               mansearch_free(res, sz);
        }
 
        }
 
-       c = fdesc(blk, ln, curp);
+       free(defos);
 
 
-       if (-1 == close(curp->fd))
-               perror(curp->file);
+       /*
+        * When using a pager, finish writing both temporary files,
+        * fork it, wait for the user to close it, and clean up.
+        */
 
 
-       return(c);
-}
+       if (tag_files != NULL) {
+               fclose(stdout);
+               tag_write();
+               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. */
 
 
-static int
-fdesc(struct buf *blk, struct buf *ln, struct curparse *curp)
-{
-       size_t           sz;
-       ssize_t          ssz;
-       struct stat      st;
-       int              j, i, pos, lnn, comment;
-       struct man      *man;
-       struct mdoc     *mdoc;
+                       if (pager_pid) {
+                               (void)tcsetpgrp(tag_files->ofd, pager_pid);
+                               kill(pager_pid, SIGCONT);
+                       } else
+                               pager_pid = spawn_pager(tag_files);
 
 
-       sz = BUFSIZ;
-       man = NULL;
-       mdoc = NULL;
+                       /* Wait for the pager to stop or exit. */
 
 
-       /*
-        * Two buffers: ln and buf.  buf is the input buffer optimised
-        * here for each file's block size.  ln is a line buffer.  Both
-        * growable, hence passed in by ptr-ptr.
-        */
+                       while ((pid = waitpid(pager_pid, &status,
+                           WUNTRACED)) == -1 && errno == EINTR)
+                               continue;
 
 
-       if (-1 == fstat(curp->fd, &st))
-               perror(curp->file);
-       else if ((size_t)st.st_blksize > sz)
-               sz = st.st_blksize;
+                       if (pid == -1) {
+                               warn("wait");
+                               rc = MANDOCLEVEL_SYSERR;
+                               break;
+                       }
+                       if (!WIFSTOPPED(status))
+                               break;
 
 
-       if (sz > blk->sz) {
-               blk->buf = realloc(blk->buf, sz);
-               if (NULL == blk->buf) {
-                       perror(NULL);
-                       exit(EXIT_FAILURE);
+                       signum = WSTOPSIG(status);
                }
                }
-               blk->sz = sz;
+               tag_unlink();
        }
 
        }
 
-       /* Fill buf with file blocksize. */
+       return (int)rc;
+}
 
 
-       for (lnn = pos = comment = 0; ; ) {
-               if (-1 == (ssz = read(curp->fd, blk->buf, sz))) {
-                       perror(curp->file);
-                       return(-1);
-               } else if (0 == ssz) 
-                       break;
+static void
+usage(enum argmode argmode)
+{
 
 
-               /* Parse the read block into partial or full lines. */
+       switch (argmode) {
+       case ARG_FILE:
+               fputs("usage: mandoc [-acfhkl] [-I os=name] "
+                   "[-K encoding] [-mformat] [-O option]\n"
+                   "\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);
+               break;
+       case ARG_WORD:
+               fputs("usage: whatis [-acfhklw] [-C file] "
+                   "[-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] "
+                   "[-M path] [-m path] [-O outkey] [-S arch]\n"
+                   "\t       [-s section] expression ...\n", stderr);
+               break;
+       }
+       exit((int)MANDOCLEVEL_BADARG);
+}
 
 
-               for (i = 0; i < (int)ssz; i++) {
-                       if (pos >= (int)ln->sz) {
-                               ln->sz += 256; /* Step-size. */
-                               ln->buf = realloc(ln->buf, ln->sz);
-                               if (NULL == ln->buf) {
-                                       perror(NULL);
-                                       return(EXIT_FAILURE);
-                               }
-                       }
+static int
+fs_lookup(const struct manpaths *paths, size_t ipath,
+       const char *sec, const char *arch, const char *name,
+       struct manpage **res, size_t *ressz)
+{
+       glob_t           globinfo;
+       struct manpage  *page;
+       char            *file;
+       int              globres;
+       enum form        form;
+
+       form = FORM_SRC;
+       mandoc_asprintf(&file, "%s/man%s/%s.%s",
+           paths->paths[ipath], sec, name, sec);
+       if (access(file, R_OK) != -1)
+               goto found;
+       free(file);
+
+       mandoc_asprintf(&file, "%s/cat%s/%s.0",
+           paths->paths[ipath], sec, name);
+       if (access(file, R_OK) != -1) {
+               form = FORM_CAT;
+               goto found;
+       }
+       free(file);
+
+       if (arch != NULL) {
+               mandoc_asprintf(&file, "%s/man%s/%s/%s.%s",
+                   paths->paths[ipath], sec, arch, name, sec);
+               if (access(file, R_OK) != -1)
+                       goto found;
+               free(file);
+       }
 
 
-                       if ('\n' != blk->buf[i]) {
-                               if (comment)
-                                       continue;
-                               ln->buf[pos++] = blk->buf[i];
+       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)
+               warn("%s: glob", file);
+       free(file);
+       if (globres == 0)
+               file = mandoc_strdup(*globinfo.gl_pathv);
+       globfree(&globinfo);
+       if (globres != 0)
+               return 0;
+
+found:
+       warnx("outdated mandoc.db lacks %s(%s) entry, run %s %s",
+           name, sec, BINM_MAKEWHATIS, paths->paths[ipath]);
+       *res = mandoc_reallocarray(*res, ++*ressz, sizeof(struct manpage));
+       page = *res + (*ressz - 1);
+       page->file = file;
+       page->names = NULL;
+       page->output = NULL;
+       page->ipath = ipath;
+       page->bits = NAME_FILE & NAME_MASK;
+       page->sec = (*sec >= '1' && *sec <= '9') ? *sec - '1' + 1 : 10;
+       page->form = form;
+       return 1;
+}
 
 
-                               /* Handle in-line `\"' comments. */
+static void
+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", "5", "7", "4", "9", "3p"};
+       const size_t nsec = sizeof(sections)/sizeof(sections[0]);
+
+       size_t           ipath, isec, lastsz;
+
+       assert(cfg->argmode == ARG_NAME);
+
+       *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) &&
+                                   cfg->firstmatch)
+                                       return;
+                       } else for (isec = 0; isec < nsec; isec++)
+                               if (fs_lookup(paths, ipath, sections[isec],
+                                   cfg->arch, *argv, res, ressz) &&
+                                   cfg->firstmatch)
+                                       return;
+               }
+               if (*ressz == lastsz)
+                       warnx("No entry for %s in the manual.", *argv);
+               lastsz = *ressz;
+               argv++;
+               argc--;
+       }
+}
 
 
-                               if (1 == pos || '\"' != ln->buf[pos - 1])
-                                       continue;
+static void
+parse(struct curparse *curp, int fd, const char *file)
+{
+       enum mandoclevel  rctmp;
+       struct roff_man  *man;
 
 
-                               for (j = pos - 2; j >= 0; j--)
-                                       if ('\\' != ln->buf[j])
-                                               break;
+       /* Begin by parsing the file itself. */
 
 
-                               if ( ! ((pos - 2 - j) % 2))
-                                       continue;
+       assert(file);
+       assert(fd >= 0);
 
 
-                               comment = 1;
-                               pos -= 2;
-                               for (; pos > 0; --pos) {
-                                       if (ln->buf[pos] != ' ')
-                                               break;
-                                       if (ln->buf[pos - 1] == '\\')
-                                               break;
-                               }
-                               continue;
-                       } 
-
-                       /* Handle escaped `\\n' newlines. */
-
-                       if (pos > 0 && 0 == comment && 
-                                       '\\' == ln->buf[pos - 1]) {
-                               for (j = pos - 1; j >= 0; j--)
-                                       if ('\\' != ln->buf[j])
-                                               break;
-                               if ( ! ((pos - j) % 2)) {
-                                       pos--;
-                                       lnn++;
-                                       continue;
-                               }
-                       }
+       rctmp = mparse_readfd(curp->mp, fd, file);
+       if (fd != STDIN_FILENO)
+               close(fd);
+       if (rc < rctmp)
+               rc = rctmp;
 
 
-                       ln->buf[pos] = 0;
-                       lnn++;
+       /*
+        * With -Wstop and warnings or errors of at least the requested
+        * level, do not produce output.
+        */
 
 
-                       /* If unset, assign parser in pset(). */
+       if (rctmp != MANDOCLEVEL_OK && curp->wstop)
+               return;
 
 
-                       if ( ! (man || mdoc) && ! pset(ln->buf, 
-                                               pos, curp, &man, &mdoc))
-                               return(-1);
+       if (curp->outdata == NULL)
+               outdata_alloc(curp);
 
 
-                       pos = comment = 0;
+       mparse_result(curp->mp, &man, NULL);
 
 
-                       /* Pass down into parsers. */
+       /* Execute the out device, if it exists. */
 
 
-                       if (man && ! man_parseln(man, lnn, ln->buf))
-                               return(0);
-                       if (mdoc && ! mdoc_parseln(mdoc, lnn, ln->buf))
-                               return(0);
+       if (man == NULL)
+               return;
+       if (man->macroset == MACROSET_MDOC) {
+               mdoc_validate(man);
+               switch (curp->outtype) {
+               case OUTT_HTML:
+                       html_mdoc(curp->outdata, man);
+                       break;
+               case OUTT_TREE:
+                       tree_mdoc(curp->outdata, man);
+                       break;
+               case OUTT_MAN:
+                       man_mdoc(curp->outdata, man);
+                       break;
+               case OUTT_PDF:
+               case OUTT_ASCII:
+               case OUTT_UTF8:
+               case OUTT_LOCALE:
+               case OUTT_PS:
+                       terminal_mdoc(curp->outdata, man);
+                       break;
+               default:
+                       break;
                }
        }
                }
        }
-
-       /* NOTE a parser may not have been assigned, yet. */
-
-       if ( ! (man || mdoc)) {
-               fprintf(stderr, "%s: Not a manual\n", curp->file);
-               return(0);
-       }
-
-       if (mdoc && ! mdoc_endparse(mdoc))
-               return(0);
-       if (man && ! man_endparse(man))
-               return(0);
-
-       /* If unset, allocate output dev now (if applicable). */
-
-       if ( ! (curp->outman && curp->outmdoc)) {
+       if (man->macroset == MACROSET_MAN) {
+               man_validate(man);
                switch (curp->outtype) {
                switch (curp->outtype) {
-               case (OUTT_XHTML):
-                       curp->outdata = xhtml_alloc(curp->outopts);
-                       curp->outman = html_man;
-                       curp->outmdoc = html_mdoc;
-                       curp->outfree = html_free;
+               case OUTT_HTML:
+                       html_man(curp->outdata, man);
                        break;
                        break;
-               case (OUTT_HTML):
-                       curp->outdata = html_alloc(curp->outopts);
-                       curp->outman = html_man;
-                       curp->outmdoc = html_mdoc;
-                       curp->outfree = html_free;
+               case OUTT_TREE:
+                       tree_man(curp->outdata, man);
                        break;
                        break;
-               case (OUTT_TREE):
-                       curp->outman = tree_man;
-                       curp->outmdoc = tree_mdoc;
+               case OUTT_MAN:
+                       man_man(curp->outdata, man);
                        break;
                        break;
-               case (OUTT_LINT):
+               case OUTT_PDF:
+               case OUTT_ASCII:
+               case OUTT_UTF8:
+               case OUTT_LOCALE:
+               case OUTT_PS:
+                       terminal_man(curp->outdata, man);
                        break;
                default:
                        break;
                default:
-                       curp->outdata = ascii_alloc();
-                       curp->outman = terminal_man;
-                       curp->outmdoc = terminal_mdoc;
-                       curp->outfree = terminal_free;
                        break;
                }
        }
                        break;
                }
        }
-
-       /* Execute the out device, if it exists. */
-
-       if (man && curp->outman)
-               (*curp->outman)(curp->outdata, man);
-       if (mdoc && curp->outmdoc)
-               (*curp->outmdoc)(curp->outdata, mdoc);
-
-       return(1);
+       mparse_updaterc(curp->mp, &rc);
 }
 
 }
 
+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 int
-pset(const char *buf, int pos, struct curparse *curp,
-               struct man **man, struct mdoc **mdoc)
+static void
+passthrough(const char *file, int fd, int synopsis_only)
 {
 {
-       int              i;
+       const char       synb[] = "S\bSY\bYN\bNO\bOP\bPS\bSI\bIS\bS";
+       const char       synr[] = "SYNOPSIS";
+
+       FILE            *stream;
+       const char      *syscall;
+       char            *line, *cp;
+       size_t           linesz;
+       ssize_t          len, written;
+       int              print;
+
+       line = NULL;
+       linesz = 0;
+
+       if (fflush(stdout) == EOF) {
+               syscall = "fflush";
+               goto fail;
+       }
 
 
-       /*
-        * Try to intuit which kind of manual parser should be used.  If
-        * passed in by command-line (-man, -mdoc), then use that
-        * explicitly.  If passed as -mandoc, then try to guess from the
-        * line: either skip dot-lines, use -mdoc when finding `.Dt', or
-        * default to -man, which is more lenient.
-        */
+       if ((stream = fdopen(fd, "r")) == NULL) {
+               close(fd);
+               syscall = "fdopen";
+               goto fail;
+       }
 
 
-       if (buf[0] == '.') {
-               for (i = 1; buf[i]; i++)
-                       if (' ' != buf[i] && '\t' != buf[i])
-                               break;
-               if (0 == buf[i])
-                       return(1);
+       print = 0;
+       while ((len = getline(&line, &linesz, stream)) != -1) {
+               cp = line;
+               if (synopsis_only) {
+                       if (print) {
+                               if ( ! isspace((unsigned char)*cp))
+                                       goto done;
+                               while (isspace((unsigned char)*cp)) {
+                                       cp++;
+                                       len--;
+                               }
+                       } else {
+                               if (strcmp(cp, synb) == 0 ||
+                                   strcmp(cp, synr) == 0)
+                                       print = 1;
+                               continue;
+                       }
+               }
+               for (; len > 0; len -= written) {
+                       if ((written = write(STDOUT_FILENO, cp, len)) != -1)
+                               continue;
+                       fclose(stream);
+                       syscall = "write";
+                       goto fail;
+               }
        }
 
        }
 
-       switch (curp->inttype) {
-       case (INTT_MDOC):
-               if (NULL == curp->mdoc) 
-                       curp->mdoc = mdoc_init(curp);
-               if (NULL == (*mdoc = curp->mdoc))
-                       return(0);
-               curp->lastmdoc = *mdoc;
-               return(1);
-       case (INTT_MAN):
-               if (NULL == curp->man) 
-                       curp->man = man_init(curp);
-               if (NULL == (*man = curp->man))
-                       return(0);
-               curp->lastman = *man;
-               return(1);
-       default:
-               break;
+       if (ferror(stream)) {
+               fclose(stream);
+               syscall = "getline";
+               goto fail;
        }
 
        }
 
-       if (pos >= 3 && 0 == memcmp(buf, ".Dd", 3))  {
-               if (NULL == curp->mdoc) 
-                       curp->mdoc = mdoc_init(curp);
-               if (NULL == (*mdoc = curp->mdoc))
-                       return(0);
-               curp->lastmdoc = *mdoc;
-               return(1);
-       } 
-
-       if (NULL == curp->man) 
-               curp->man = man_init(curp);
-       if (NULL == (*man = curp->man))
-               return(0);
-       curp->lastman = *man;
-       return(1);
+done:
+       free(line);
+       fclose(stream);
+       return;
+
+fail:
+       free(line);
+       warn("%s: SYSERR: %s", file, syscall);
+       if (rc < MANDOCLEVEL_SYSERR)
+               rc = MANDOCLEVEL_SYSERR;
 }
 
 }
 
+static int
+koptions(int *options, char *arg)
+{
+
+       if ( ! strcmp(arg, "utf-8")) {
+               *options |=  MPARSE_UTF8;
+               *options &= ~MPARSE_LATIN1;
+       } else if ( ! strcmp(arg, "iso-8859-1")) {
+               *options |=  MPARSE_LATIN1;
+               *options &= ~MPARSE_UTF8;
+       } else if ( ! strcmp(arg, "us-ascii")) {
+               *options &= ~(MPARSE_UTF8 | MPARSE_LATIN1);
+       } else {
+               warnx("-K %s: Bad argument", arg);
+               return 0;
+       }
+       return 1;
+}
 
 static int
 
 static int
-moptions(enum intt *tflags, char *arg)
+moptions(int *options, char *arg)
 {
 
 {
 
-       if (0 == strcmp(arg, "doc"))
-               *tflags = INTT_MDOC;
+       if (arg == NULL)
+               /* nothing to do */;
+       else if (0 == strcmp(arg, "doc"))
+               *options |= MPARSE_MDOC;
        else if (0 == strcmp(arg, "andoc"))
        else if (0 == strcmp(arg, "andoc"))
-               *tflags = INTT_AUTO;
+               /* nothing to do */;
        else if (0 == strcmp(arg, "an"))
        else if (0 == strcmp(arg, "an"))
-               *tflags = INTT_MAN;
+               *options |= MPARSE_MAN;
        else {
        else {
-               fprintf(stderr, "%s: Bad argument\n", arg);
-               return(0);
+               warnx("-m %s: Bad argument", arg);
+               return 0;
        }
 
        }
 
-       return(1);
+       return 1;
 }
 
 }
 
-
 static int
 toptions(struct curparse *curp, char *arg)
 {
 static int
 toptions(struct curparse *curp, char *arg)
 {
@@ -557,129 +936,173 @@ 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->wflags |= WARN_WALL;
-               curp->fflags |= FL_STRICT;
-       }
-       else if (0 == strcmp(arg, "tree"))
+               curp->wlevel  = MANDOCLEVEL_WARNING;
+       } else if (0 == strcmp(arg, "tree"))
                curp->outtype = OUTT_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, "html"))
                curp->outtype = OUTT_HTML;
+       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"))
        else if (0 == strcmp(arg, "xhtml"))
-               curp->outtype = OUTT_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 {
-               fprintf(stderr, "%s: Bad argument\n", arg);
-               return(0);
+               warnx("-T %s: Bad argument", arg);
+               return 0;
        }
 
        }
 
-       return(1);
+       return 1;
 }
 
 }
 
-
 static int
 static int
-foptions(int *fflags, char *arg)
+woptions(struct curparse *curp, char *arg)
 {
        char            *v, *o;
 {
        char            *v, *o;
-       const char      *toks[8];
-
-       toks[0] = "ign-scope";
-       toks[1] = "no-ign-escape";
-       toks[2] = "no-ign-macro";
-       toks[3] = "ign-errors";
-       toks[4] = "strict";
-       toks[5] = "ign-escape";
+       const char      *toks[7];
+
+       toks[0] = "stop";
+       toks[1] = "all";
+       toks[2] = "warning";
+       toks[3] = "error";
+       toks[4] = "unsupp";
+       toks[5] = "fatal";
        toks[6] = NULL;
 
        while (*arg) {
                o = arg;
        toks[6] = NULL;
 
        while (*arg) {
                o = arg;
-               switch (getsubopt(&arg, UNCONST(toks), &v)) {
-               case (0):
-                       *fflags |= FL_IGN_SCOPE;
-                       break;
-               case (1):
-                       *fflags |= FL_NIGN_ESCAPE;
+               switch (getsubopt(&arg, (char * const *)toks, &v)) {
+               case 0:
+                       curp->wstop = 1;
                        break;
                        break;
-               case (2):
-                       *fflags |= FL_NIGN_MACRO;
+               case 1:
+               case 2:
+                       curp->wlevel = MANDOCLEVEL_WARNING;
                        break;
                        break;
-               case (3):
-                       *fflags |= FL_IGN_ERRORS;
+               case 3:
+                       curp->wlevel = MANDOCLEVEL_ERROR;
                        break;
                        break;
-               case (4):
-                       *fflags |= FL_STRICT;
+               case 4:
+                       curp->wlevel = MANDOCLEVEL_UNSUPP;
                        break;
                        break;
-               case (5):
-                       *fflags &= ~FL_NIGN_ESCAPE;
+               case 5:
+                       curp->wlevel = MANDOCLEVEL_BADARG;
                        break;
                default:
                        break;
                default:
-                       fprintf(stderr, "%s: Bad argument\n", o);
-                       return(0);
+                       warnx("-W %s: Bad argument", o);
+                       return 0;
                }
        }
 
                }
        }
 
-       return(1);
+       return 1;
 }
 
 }
 
-
-static int
-woptions(int *wflags, char *arg)
+static void
+mmsg(enum mandocerr t, enum mandoclevel lvl,
+               const char *file, int line, int col, const char *msg)
 {
 {
-       char            *v, *o;
-       const char      *toks[3]; 
+       const char      *mparse_msg;
 
 
-       toks[0] = "all";
-       toks[1] = "error";
-       toks[2] = NULL;
+       fprintf(stderr, "%s: %s:", getprogname(),
+           file == NULL ? "<stdin>" : file);
 
 
-       while (*arg) {
-               o = arg;
-               switch (getsubopt(&arg, UNCONST(toks), &v)) {
-               case (0):
-                       *wflags |= WARN_WALL;
-                       break;
-               case (1):
-                       *wflags |= WARN_WERR;
-                       break;
-               default:
-                       fprintf(stderr, "%s: Bad argument\n", o);
-                       return(0);
-               }
-       }
+       if (line)
+               fprintf(stderr, "%d:%d:", line, col + 1);
 
 
-       return(1);
-}
+       fprintf(stderr, " %s", mparse_strlevel(lvl));
 
 
+       if (NULL != (mparse_msg = mparse_strerror(t)))
+               fprintf(stderr, ": %s", mparse_msg);
 
 
-/* ARGSUSED */
-static int
-merr(void *arg, int line, int col, const char *msg)
+       if (msg)
+               fprintf(stderr, ": %s", msg);
+
+       fputc('\n', stderr);
+}
+
+static pid_t
+spawn_pager(struct tag_files *tag_files)
 {
 {
-       struct curparse *curp;
+       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;
+       int              argc;
+       pid_t            pager_pid;
+
+       pager = getenv("MANPAGER");
+       if (pager == NULL || *pager == '\0')
+               pager = getenv("PAGER");
+       if (pager == NULL || *pager == '\0')
+               pager = "more -s";
+       cp = mandoc_strdup(pager);
 
 
-       curp = (struct curparse *)arg;
+       /*
+        * Parse the pager command into words.
+        * Intentionally do not do anything fancy here.
+        */
 
 
-       (void)fprintf(stderr, "%s:%d:%d: error: %s\n", 
-                       curp->file, line, col + 1, msg);
+       argc = 0;
+       while (argc + 4 < MAX_PAGER_ARGS) {
+               argv[argc++] = cp;
+               cp = strchr(cp, ' ');
+               if (cp == NULL)
+                       break;
+               *cp++ = '\0';
+               while (*cp == ' ')
+                       cp++;
+               if (*cp == '\0')
+                       break;
+       }
 
 
-       return(0);
-}
+       /* For less(1), use the tag file. */
 
 
+       if ((cmdlen = strlen(argv[0])) >= 4) {
+               cp = argv[0] + cmdlen - 4;
+               if (strcmp(cp, "less") == 0) {
+                       argv[argc++] = mandoc_strdup("-T");
+                       argv[argc++] = tag_files->tfn;
+               }
+       }
+       argv[argc++] = tag_files->ofn;
+       argv[argc] = NULL;
 
 
-static int
-mwarn(void *arg, int line, int col, const char *msg)
-{
-       struct curparse *curp;
+       switch (pager_pid = fork()) {
+       case -1:
+               err((int)MANDOCLEVEL_SYSERR, "fork");
+       case 0:
+               break;
+       default:
+               (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;
+       }
 
 
-       curp = (struct curparse *)arg;
+       /* The child process becomes the pager. */
 
 
-       if ( ! (curp->wflags & WARN_WALL))
-               return(1);
+       if (dup2(tag_files->ofd, STDOUT_FILENO) == -1)
+               err((int)MANDOCLEVEL_SYSERR, "pager stdout");
+       close(tag_files->ofd);
+       close(tag_files->tfd);
 
 
-       (void)fprintf(stderr, "%s:%d:%d: warning: %s\n", 
-                       curp->file, line, col + 1, msg);
+       /* Do not start the pager before controlling the terminal. */
 
 
-       if ( ! (curp->wflags & WARN_WERR))
-               return(1);
-       
-       return(0);
-}
+       while (tcgetpgrp(STDOUT_FILENO) != getpid())
+               nanosleep(&timeout, NULL);
 
 
+       execvp(argv[0], argv);
+       err((int)MANDOCLEVEL_SYSERR, "exec %s", argv[0]);
+}
A git conversion mirror of mandoc.bsd.lv