]> git.cameronkatri.com Git - mandoc.git/blobdiff - main.c
On a new RS nesting level, the saved width starts from the default
[mandoc.git] / main.c
diff --git a/main.c b/main.c
index 213b60688e820b3295b925980cca7f06a9e583b0..61e90fe581f52d22c0e95a20a2e31c2c7683b34f 100644 (file)
--- a/main.c
+++ b/main.c
@@ -1,16 +1,16 @@
-/*     $Id: main.c,v 1.180 2014/08/17 03:24:47 schwarze Exp $ */
+/*     $Id: main.c,v 1.232 2015/04/03 08:46:17 schwarze Exp $ */
 /*
- * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
- * Copyright (c) 2010, 2011, 2012, 2014 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2010-2012, 2014, 2015 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.
  *
- * 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
- * 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
 #include "config.h"
 
 #include <sys/types.h>
+#include <sys/param.h> /* MACHINE */
+#include <sys/wait.h>
 
 #include <assert.h>
+#include <ctype.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <glob.h>
+#include <signal.h>
 #include <stdio.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 
-#include "mandoc.h"
 #include "mandoc_aux.h"
-#include "main.h"
+#include "mandoc.h"
+#include "roff.h"
 #include "mdoc.h"
 #include "man.h"
-#include "manpath.h"
+#include "main.h"
+#include "manconf.h"
 #include "mansearch.h"
 
 #if !defined(__GNUC__) || (__GNUC__ < 2)
 # endif
 #endif /* !defined(__GNUC__) || (__GNUC__ < 2) */
 
+enum   outmode {
+       OUTMODE_DEF = 0,
+       OUTMODE_FLN,
+       OUTMODE_LST,
+       OUTMODE_ALL,
+       OUTMODE_INT,
+       OUTMODE_ONE
+};
+
 typedef        void            (*out_mdoc)(void *, const struct mdoc *);
 typedef        void            (*out_man)(void *, const struct man *);
 typedef        void            (*out_free)(void *);
@@ -52,7 +69,6 @@ enum  outt {
        OUTT_TREE,      /* -Ttree */
        OUTT_MAN,       /* -Tman */
        OUTT_HTML,      /* -Thtml */
-       OUTT_XHTML,     /* -Txhtml */
        OUTT_LINT,      /* -Tlint */
        OUTT_PS,        /* -Tps */
        OUTT_PDF        /* -Tpdf */
@@ -60,6 +76,7 @@ enum  outt {
 
 struct curparse {
        struct mparse    *mp;
+       struct mchars    *mchars;       /* character table */
        enum mandoclevel  wlevel;       /* ignore messages below this */
        int               wstop;        /* stop after a file with a warning */
        enum outt         outtype;      /* which output to use */
@@ -67,97 +84,154 @@ struct     curparse {
        out_man           outman;       /* man output ptr */
        out_free          outfree;      /* free output ptr */
        void             *outdata;      /* data for output */
-       char              outopts[BUFSIZ]; /* buf of output opts */
+       struct manoutput *outopts;      /* output options */
 };
 
+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 void              handle_sigpipe(int);
+static int               koptions(int *, char *);
+#if HAVE_SQLITE3
+int                      mandocdb(int, char**);
+#endif
 static int               moptions(int *, char *);
 static void              mmsg(enum mandocerr, enum mandoclevel,
                                const char *, int, int, const char *);
-static void              parse(struct curparse *, int,
-                               const char *, enum mandoclevel *);
+static void              parse(struct curparse *, int, const char *);
+static void              passthrough(const char *, int, int);
+static pid_t             spawn_pager(void);
 static int               toptions(struct curparse *, char *);
 static void              usage(enum argmode) __attribute__((noreturn));
-static void              version(void) __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 const char       *progname;
+static enum mandoclevel  rc;
 
 
 int
 main(int argc, char *argv[])
 {
+       struct manconf   conf;
        struct curparse  curp;
        struct mansearch search;
-       struct manpaths  paths;
-       char            *conf_file, *defpaths, *auxpaths;
+       char            *auxpaths;
        char            *defos;
-#if HAVE_SQLITE3
-       struct manpage  *res;
-       size_t           i, sz;
-#endif
-       enum mandoclevel rc;
+       unsigned char   *uc;
+       struct manpage  *res, *resp;
+       char            *conf_file, *defpaths;
+       size_t           isec, i, sz;
+       int              prio, best_prio;
+       char             sec;
+       enum mandoclevel rctmp;
+       enum outmode     outmode;
+       int              fd;
        int              show_usage;
        int              options;
        int              c;
+       pid_t            pager_pid;  /* 0: don't use; 1: not yet spawned. */
 
-       progname = strrchr(argv[0], '/');
-       if (progname == NULL)
+       if (argc < 1)
+               progname = "mandoc";
+       else if ((progname = strrchr(argv[0], '/')) == NULL)
                progname = argv[0];
        else
                ++progname;
 
+#if HAVE_SQLITE3
+       if (strcmp(progname, BINM_MAKEWHATIS) == 0)
+               return(mandocdb(argc, argv));
+#endif
+
        /* Search options. */
 
-       memset(&paths, 0, sizeof(struct manpaths));
-       conf_file = defpaths = auxpaths = NULL;
+       memset(&conf, 0, sizeof(conf));
+       conf_file = defpaths = NULL;
+       auxpaths = NULL;
 
        memset(&search, 0, sizeof(struct mansearch));
        search.outkey = "Nd";
 
-       if (strcmp(progname, "man") == 0)
+       if (strcmp(progname, BINM_MAN) == 0)
                search.argmode = ARG_NAME;
-       else if (strncmp(progname, "apropos", 7) == 0)
+       else if (strcmp(progname, BINM_APROPOS) == 0)
                search.argmode = ARG_EXPR;
-       else if (strncmp(progname, "whatis", 6) == 0)
+       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;
 
        /* Parser and formatter options. */
 
        memset(&curp, 0, sizeof(struct curparse));
-       curp.outtype = OUTT_ASCII;
-       curp.wlevel  = MANDOCLEVEL_FATAL;
-       options = MPARSE_SO;
+       curp.outtype = OUTT_LOCALE;
+       curp.wlevel  = MANDOCLEVEL_BADARG;
+       curp.outopts = &conf.output;
+       options = MPARSE_SO | MPARSE_UTF8 | MPARSE_LATIN1;
        defos = NULL;
 
+       pager_pid = 1;
        show_usage = 0;
-       while (-1 != (c = getopt(argc, argv, "C:fI:kM:m:O:S:s:T:VW:"))) {
+       outmode = OUTMODE_DEF;
+
+       while (-1 != (c = getopt(argc, argv,
+                       "aC:cfhI:iK:klM:m:O:S:s:T:VW:w"))) {
                switch (c) {
+               case 'a':
+                       outmode = OUTMODE_ALL;
+                       break;
                case 'C':
                        conf_file = optarg;
                        break;
+               case 'c':
+                       pager_pid = 0;
+                       break;
                case 'f':
                        search.argmode = ARG_WORD;
                        break;
+               case 'h':
+                       conf.output.synopsisonly = 1;
+                       pager_pid = 0;
+                       outmode = OUTMODE_ALL;
+                       break;
                case 'I':
                        if (strncmp(optarg, "os=", 3)) {
                                fprintf(stderr,
-                                   "%s: -I%s: Bad argument\n",
+                                   "%s: -I %s: Bad argument\n",
                                    progname, optarg);
                                return((int)MANDOCLEVEL_BADARG);
                        }
                        if (defos) {
                                fprintf(stderr,
-                                   "%s: -I%s: Duplicate argument\n",
+                                   "%s: -I %s: Duplicate argument\n",
                                    progname, optarg);
                                return((int)MANDOCLEVEL_BADARG);
                        }
                        defos = mandoc_strdup(optarg + 3);
                        break;
+               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;
@@ -166,8 +240,9 @@ main(int argc, char *argv[])
                        break;
                case 'O':
                        search.outkey = optarg;
-                       (void)strlcat(curp.outopts, optarg, BUFSIZ);
-                       (void)strlcat(curp.outopts, ",", BUFSIZ);
+                       while (optarg != NULL)
+                               manconf_output(&conf.output,
+                                   strsep(&optarg, ","));
                        break;
                case 'S':
                        search.arch = optarg;
@@ -183,9 +258,9 @@ main(int argc, char *argv[])
                        if ( ! woptions(&curp, optarg))
                                return((int)MANDOCLEVEL_BADARG);
                        break;
-               case 'V':
-                       version();
-                       /* NOTREACHED */
+               case 'w':
+                       outmode = OUTMODE_FLN;
+                       break;
                default:
                        show_usage = 1;
                        break;
@@ -195,39 +270,151 @@ main(int argc, char *argv[])
        if (show_usage)
                usage(search.argmode);
 
-       argc -= optind;
-       argv += optind;
+       /* Postprocess options. */
+
+       if (outmode == OUTMODE_DEF) {
+               switch (search.argmode) {
+               case ARG_FILE:
+                       outmode = OUTMODE_ALL;
+                       pager_pid = 0;
+                       break;
+               case ARG_NAME:
+                       outmode = OUTMODE_ONE;
+                       break;
+               default:
+                       outmode = OUTMODE_LST;
+                       break;
+               }
+       }
+
+       /* Parse arguments. */
+
+       if (argc > 0) {
+               argc -= optind;
+               argv += optind;
+       }
+       resp = NULL;
+
+       /*
+        * 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
+       }
+
+       rc = MANDOCLEVEL_OK;
 
        /* man(1), whatis(1), apropos(1) */
 
        if (search.argmode != ARG_FILE) {
-#if HAVE_SQLITE3
                if (argc == 0)
                        usage(search.argmode);
-               manpath_parse(&paths, conf_file, defpaths, auxpaths);
+
+               if (search.argmode == ARG_NAME &&
+                   outmode == OUTMODE_ONE)
+                       search.firstmatch = 1;
+
+               /* Access the mandoc database. */
+
+               manconf_parse(&conf, conf_file, defpaths, auxpaths);
+#if HAVE_SQLITE3
                mansearch_setup(1);
-               if( ! mansearch(&search, &paths, argc, argv, &res, &sz))
+               if ( ! mansearch(&search, &conf.manpath,
+                   argc, argv, &res, &sz))
                        usage(search.argmode);
-               manpath_free(&paths);
-               for (i = 0; i < sz; i++)
-                       printf("%s - %s\n", res[i].names,
-                           res[i].output == NULL ? "" : res[i].output);
-               mansearch_free(res, sz);
-               mansearch_setup(0);
-               return((int)MANDOCLEVEL_OK);
 #else
-               fputs("mandoc: database support not compiled in\n",
-                   stderr);
-               return((int)MANDOCLEVEL_BADARG);
+               if (search.argmode != ARG_NAME) {
+                       fputs("mandoc: database support not compiled in\n",
+                           stderr);
+                       return((int)MANDOCLEVEL_BADARG);
+               }
+               sz = 0;
 #endif
+
+               if (sz == 0 && search.argmode == ARG_NAME)
+                       fs_search(&search, &conf.manpath,
+                           argc, argv, &res, &sz);
+
+               if (sz == 0) {
+                       rc = MANDOCLEVEL_BADARG;
+                       goto out;
+               }
+
+               /*
+                * 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 = 10;
+               } 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. */
+                               isec = strcspn(res[i].file, "123456789");
+                               sec = res[i].file[isec];
+                               if ('\0' == sec)
+                                       continue;
+                               prio = sec_prios[sec - '1'];
+                               if (prio >= best_prio)
+                                       continue;
+                               best_prio = prio;
+                               resp = res + i;
+                       }
+               }
+
+               /*
+                * 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.
+                */
+
+               if (outmode == OUTMODE_FLN || outmode == OUTMODE_LST)
+                       goto out;
        }
 
        /* mandoc(1) */
 
-       if ( ! moptions(&options, auxpaths))
+       if (search.argmode == ARG_FILE && ! moptions(&options, auxpaths))
                return((int)MANDOCLEVEL_BADARG);
 
-       curp.mp = mparse_alloc(options, curp.wlevel, mmsg, defos);
+       curp.mchars = mchars_alloc();
+       curp.mp = mparse_alloc(options, curp.wlevel, mmsg,
+           curp.mchars, defos);
 
        /*
         * Conditionally start up the lookaside buffer before parsing.
@@ -235,33 +422,79 @@ main(int argc, char *argv[])
        if (OUTT_MAN == curp.outtype)
                mparse_keep(curp.mp);
 
-       rc = MANDOCLEVEL_OK;
+       if (argc < 1) {
+               if (pager_pid == 1 && isatty(STDOUT_FILENO))
+                       pager_pid = spawn_pager();
+               parse(&curp, STDIN_FILENO, "<stdin>");
+       }
 
-       if (NULL == *argv)
-               parse(&curp, STDIN_FILENO, "<stdin>", &rc);
+       while (argc > 0) {
+               rctmp = mparse_open(curp.mp, &fd,
+                   resp != NULL ? resp->file : *argv);
+               if (rc < rctmp)
+                       rc = rctmp;
+
+               if (fd != -1) {
+                       if (pager_pid == 1 && isatty(STDOUT_FILENO))
+                               pager_pid = spawn_pager();
+
+                       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);
+
+                       rctmp = mparse_wait(curp.mp);
+                       if (rc < rctmp)
+                               rc = rctmp;
+
+                       if (argc > 1 && curp.outtype <= OUTT_UTF8)
+                               ascii_sepline(curp.outdata);
+               }
 
-       while (*argv) {
-               parse(&curp, -1, *argv, &rc);
                if (MANDOCLEVEL_OK != rc && curp.wstop)
                        break;
-               ++argv;
+
+               if (resp != NULL)
+                       resp++;
+               else
+                       argv++;
+               if (--argc)
+                       mparse_reset(curp.mp);
        }
 
        if (curp.outfree)
                (*curp.outfree)(curp.outdata);
-       if (curp.mp)
-               mparse_free(curp.mp);
+       mparse_free(curp.mp);
+       mchars_free(curp.mchars);
+
+out:
+       if (search.argmode != ARG_FILE) {
+               manconf_free(&conf);
+#if HAVE_SQLITE3
+               mansearch_free(res, sz);
+               mansearch_setup(0);
+#endif
+       }
+
        free(defos);
 
-       return((int)rc);
-}
+       /*
+        * 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.
+        */
 
-static void
-version(void)
-{
+       if (pager_pid != 0 && pager_pid != 1) {
+               fclose(stdout);
+               waitpid(pager_pid, NULL, 0);
+       }
 
-       printf("mandoc %s\n", VERSION);
-       exit((int)MANDOCLEVEL_OK);
+       return((int)rc);
 }
 
 static void
@@ -270,33 +503,137 @@ usage(enum argmode argmode)
 
        switch (argmode) {
        case ARG_FILE:
-               fputs("usage: mandoc [-V] [-Ios=name] [-mformat]"
-                   " [-Ooption] [-Toutput] [-Wlevel]\n"
-                   "\t      [file ...]\n", stderr);
+               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 [-acfhkVw] [-C file] "
-                   "[-M path] [-m path] [-S arch] [-s section]\n"
+               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 [-V] [-C file] [-M path] [-m path] "
-                   "[-S arch] [-s section] name ...\n", stderr);
+               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 [-V] [-C file] [-M path] [-m path] "
-                   "[-O outkey] [-S arch]\n"
+               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);
 }
 
+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              form, globres;
+
+       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);
+       }
+
+       mandoc_asprintf(&file, "%s/man%s/%s.*",
+           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));
+       free(file);
+       if (globres == 0)
+               file = mandoc_strdup(*globinfo.gl_pathv);
+       globfree(&globinfo);
+       if (globres != 0)
+               return(0);
+
+found:
+#if HAVE_SQLITE3
+       fprintf(stderr, "%s: outdated mandoc.db lacks %s(%s) entry,\n"
+           "     consider running  # makewhatis %s\n",
+           progname, name, sec, paths->paths[ipath]);
+#endif
+
+       *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);
+}
+
+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", "3p", "5", "7", "4", "9"};
+       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)
+                       fprintf(stderr,
+                           "%s: No entry for %s in the manual.\n",
+                           progname, *argv);
+               lastsz = *ressz;
+               argv++;
+               argc--;
+       }
+}
+
 static void
-parse(struct curparse *curp, int fd, const char *file,
-       enum mandoclevel *level)
+parse(struct curparse *curp, int fd, const char *file)
 {
-       enum mandoclevel  rc;
+       enum mandoclevel  rctmp;
        struct mdoc      *mdoc;
        struct man       *man;
 
@@ -305,51 +642,50 @@ parse(struct curparse *curp, int fd, const char *file,
        assert(file);
        assert(fd >= -1);
 
-       rc = mparse_readfd(curp->mp, fd, file);
-
-       /* Stop immediately if the parse has failed. */
-
-       if (MANDOCLEVEL_FATAL <= rc)
-               goto cleanup;
+       rctmp = mparse_readfd(curp->mp, fd, file);
+       if (rc < rctmp)
+               rc = rctmp;
 
        /*
         * With -Wstop and warnings or errors of at least the requested
         * level, do not produce output.
         */
 
-       if (MANDOCLEVEL_OK != rc && curp->wstop)
-               goto cleanup;
+       if (rctmp != MANDOCLEVEL_OK && curp->wstop)
+               return;
 
        /* If unset, allocate output dev now (if applicable). */
 
        if ( ! (curp->outman && curp->outmdoc)) {
                switch (curp->outtype) {
-               case OUTT_XHTML:
-                       curp->outdata = xhtml_alloc(curp->outopts);
-                       curp->outfree = html_free;
-                       break;
                case OUTT_HTML:
-                       curp->outdata = html_alloc(curp->outopts);
+                       curp->outdata = html_alloc(curp->mchars,
+                           curp->outopts);
                        curp->outfree = html_free;
                        break;
                case OUTT_UTF8:
-                       curp->outdata = utf8_alloc(curp->outopts);
+                       curp->outdata = utf8_alloc(curp->mchars,
+                           curp->outopts);
                        curp->outfree = ascii_free;
                        break;
                case OUTT_LOCALE:
-                       curp->outdata = locale_alloc(curp->outopts);
+                       curp->outdata = locale_alloc(curp->mchars,
+                           curp->outopts);
                        curp->outfree = ascii_free;
                        break;
                case OUTT_ASCII:
-                       curp->outdata = ascii_alloc(curp->outopts);
+                       curp->outdata = ascii_alloc(curp->mchars,
+                           curp->outopts);
                        curp->outfree = ascii_free;
                        break;
                case OUTT_PDF:
-                       curp->outdata = pdf_alloc(curp->outopts);
+                       curp->outdata = pdf_alloc(curp->mchars,
+                           curp->outopts);
                        curp->outfree = pspdf_free;
                        break;
                case OUTT_PS:
-                       curp->outdata = ps_alloc(curp->outopts);
+                       curp->outdata = ps_alloc(curp->mchars,
+                           curp->outopts);
                        curp->outfree = pspdf_free;
                        break;
                default:
@@ -358,8 +694,6 @@ parse(struct curparse *curp, int fd, const char *file,
 
                switch (curp->outtype) {
                case OUTT_HTML:
-                       /* FALLTHROUGH */
-               case OUTT_XHTML:
                        curp->outman = html_man;
                        curp->outmdoc = html_mdoc;
                        break;
@@ -396,13 +730,93 @@ parse(struct curparse *curp, int fd, const char *file,
                (*curp->outman)(curp->outdata, man);
        if (mdoc && curp->outmdoc)
                (*curp->outmdoc)(curp->outdata, mdoc);
+}
+
+static void
+passthrough(const char *file, int fd, int synopsis_only)
+{
+       const char       synb[] = "S\bSY\bYN\bNO\bOP\bPS\bSI\bIS\bS";
+       const char       synr[] = "SYNOPSIS";
+
+       FILE            *stream;
+       const char      *syscall;
+       char            *line;
+       size_t           len, off;
+       ssize_t          nw;
+       int              print;
+
+       fflush(stdout);
+
+       if ((stream = fdopen(fd, "r")) == NULL) {
+               close(fd);
+               syscall = "fdopen";
+               goto fail;
+       }
+
+       print = 0;
+       while ((line = fgetln(stream, &len)) != NULL) {
+               if (synopsis_only) {
+                       if (print) {
+                               if ( ! isspace((unsigned char)*line))
+                                       goto done;
+                               while (len &&
+                                   isspace((unsigned char)*line)) {
+                                       line++;
+                                       len--;
+                               }
+                       } else {
+                               if ((len == sizeof(synb) &&
+                                    ! strncmp(line, synb, len - 1)) ||
+                                   (len == sizeof(synr) &&
+                                    ! strncmp(line, synr, len - 1)))
+                                       print = 1;
+                               continue;
+                       }
+               }
+               for (off = 0; off < len; off += nw)
+                       if ((nw = write(STDOUT_FILENO, line + off,
+                           len - off)) == -1 || nw == 0) {
+                               fclose(stream);
+                               syscall = "write";
+                               goto fail;
+                       }
+       }
+
+       if (ferror(stream)) {
+               fclose(stream);
+               syscall = "fgetln";
+               goto fail;
+       }
+
+done:
+       fclose(stream);
+       return;
 
- cleanup:
+fail:
+       fprintf(stderr, "%s: %s: SYSERR: %s: %s",
+           progname, file, syscall, strerror(errno));
+       if (rc < MANDOCLEVEL_SYSERR)
+               rc = MANDOCLEVEL_SYSERR;
+}
 
-       mparse_reset(curp->mp);
+static int
+koptions(int *options, char *arg)
+{
 
-       if (*level < rc)
-               *level = rc;
+       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 {
+               fprintf(stderr, "%s: -K %s: Bad argument\n",
+                   progname, arg);
+               return(0);
+       }
+       return(1);
 }
 
 static int
@@ -418,7 +832,7 @@ moptions(int *options, char *arg)
        else if (0 == strcmp(arg, "an"))
                *options |= MPARSE_MAN;
        else {
-               fprintf(stderr, "%s: -m%s: Bad argument\n",
+               fprintf(stderr, "%s: -m %s: Bad argument\n",
                    progname, arg);
                return(0);
        }
@@ -446,13 +860,13 @@ toptions(struct curparse *curp, char *arg)
        else if (0 == strcmp(arg, "locale"))
                curp->outtype = OUTT_LOCALE;
        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 {
-               fprintf(stderr, "%s: -T%s: Bad argument\n",
+               fprintf(stderr, "%s: -T %s: Bad argument\n",
                    progname, arg);
                return(0);
        }
@@ -464,14 +878,15 @@ static int
 woptions(struct curparse *curp, char *arg)
 {
        char            *v, *o;
-       const char      *toks[6];
+       const char      *toks[7];
 
        toks[0] = "stop";
        toks[1] = "all";
        toks[2] = "warning";
        toks[3] = "error";
-       toks[4] = "fatal";
-       toks[5] = NULL;
+       toks[4] = "unsupp";
+       toks[5] = "fatal";
+       toks[6] = NULL;
 
        while (*arg) {
                o = arg;
@@ -488,10 +903,13 @@ woptions(struct curparse *curp, char *arg)
                        curp->wlevel = MANDOCLEVEL_ERROR;
                        break;
                case 4:
-                       curp->wlevel = MANDOCLEVEL_FATAL;
+                       curp->wlevel = MANDOCLEVEL_UNSUPP;
+                       break;
+               case 5:
+                       curp->wlevel = MANDOCLEVEL_BADARG;
                        break;
                default:
-                       fprintf(stderr, "%s: -W%s: Bad argument\n",
+                       fprintf(stderr, "%s: -W %s: Bad argument\n",
                            progname, o);
                        return(0);
                }
@@ -521,3 +939,90 @@ mmsg(enum mandocerr t, enum mandoclevel lvl,
 
        fputc('\n', stderr);
 }
+
+static void
+handle_sigpipe(int signum)
+{
+
+       exit((int)rc);
+}
+
+static pid_t
+spawn_pager(void)
+{
+#define MAX_PAGER_ARGS 16
+       char            *argv[MAX_PAGER_ARGS];
+       const char      *pager;
+       char            *cp;
+       int              fildes[2];
+       int              argc;
+       pid_t            pager_pid;
+
+       if (pipe(fildes) == -1) {
+               fprintf(stderr, "%s: pipe: %s\n",
+                   progname, strerror(errno));
+               return(0);
+       }
+
+       switch (pager_pid = fork()) {
+       case -1:
+               fprintf(stderr, "%s: fork: %s\n",
+                   progname, strerror(errno));
+               exit((int)MANDOCLEVEL_SYSERR);
+       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);
+       }
+
+       /* 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]);
+
+       pager = getenv("MANPAGER");
+       if (pager == NULL || *pager == '\0')
+               pager = getenv("PAGER");
+       if (pager == NULL || *pager == '\0')
+               pager = "more -s";
+       cp = mandoc_strdup(pager);
+
+       /*
+        * Parse the pager command into words.
+        * Intentionally do not do anything fancy here.
+        */
+
+       argc = 0;
+       while (argc + 1 < MAX_PAGER_ARGS) {
+               argv[argc++] = cp;
+               cp = strchr(cp, ' ');
+               if (cp == NULL)
+                       break;
+               *cp++ = '\0';
+               while (*cp == ' ')
+                       cp++;
+               if (*cp == '\0')
+                       break;
+       }
+       argv[argc] = NULL;
+
+       /* Hand over to the pager. */
+
+       execvp(argv[0], argv);
+       fprintf(stderr, "%s: exec: %s\n",
+           progname, strerror(errno));
+       exit((int)MANDOCLEVEL_SYSERR);
+}