If we have to reparse the text line because we spring an input line trap,

[mandoc.git] / main.c

diff --git a/main.c b/main.c
index a79523bf9f42933cb6627b634e2d99ea6d1d3a97..92730522ae0e37d06ce0886ecc6a73734f694e20 100644 (file)
--- a/main.c
+++ b/main.c
@@ -1,4 +1,4 @@
-/*     $Id: main.c,v 1.215 2015/01/15 04:26:39 schwarze Exp $ */
+/*     $Id: main.c,v 1.244 2015/07/28 18:38:55 schwarze Exp $ */

 /*
  * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010-2012, 2014, 2015 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>


@@ -8,9 +8,9 @@
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
  *
  * 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
  * 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


@@ -19,23 +19,29 @@
 #include "config.h"
 
 #include <sys/types.h>
 #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 <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 <stdio.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 

-#include "mandoc.h"

 #include "mandoc_aux.h"
 #include "mandoc_aux.h"

-#include "main.h"
+#include "mandoc.h"
+#include "roff.h"

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

-#include "manpath.h"
+#include "tag.h"
+#include "main.h"
+#include "manconf.h"

 #include "mansearch.h"
 
 #if !defined(__GNUC__) || (__GNUC__ < 2)
 #include "mansearch.h"
 
 #if !defined(__GNUC__) || (__GNUC__ < 2)


@@ -53,8 +59,8 @@ enum  outmode {
        OUTMODE_ONE
 };
 
        OUTMODE_ONE
 };
 

-typedef        void            (*out_mdoc)(void *, const struct mdoc *);
-typedef        void            (*out_man)(void *, const struct man *);
+typedef        void            (*out_mdoc)(void *, const struct roff_man *);
+typedef        void            (*out_man)(void *, const struct roff_man *);

 typedef        void            (*out_free)(void *);
 
 enum   outt {
 typedef        void            (*out_free)(void *);
 
 enum   outt {


@@ -79,10 +85,9 @@ struct       curparse {
        out_man           outman;       /* man output ptr */
        out_free          outfree;      /* free output ptr */
        void             *outdata;      /* data for output */
        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 */

 };
 
 };
 

-#if HAVE_SQLITE3

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


@@ -90,7 +95,6 @@ static        int               fs_lookup(const struct manpaths *,
 static void              fs_search(const struct mansearch *,
                                const struct manpaths *, int, char**,
                                struct manpage **, size_t *);
 static void              fs_search(const struct mansearch *,
                                const struct manpaths *, int, char**,
                                struct manpage **, size_t *);

-#endif

 static int               koptions(int *, char *);
 #if HAVE_SQLITE3
 int                      mandocdb(int, char**);
 static int               koptions(int *, char *);
 #if HAVE_SQLITE3
 int                      mandocdb(int, char**);


@@ -98,49 +102,46 @@ int                          mandocdb(int, char**);
 static int               moptions(int *, char *);
 static void              mmsg(enum mandocerr, enum mandoclevel,
                                const char *, int, int, const char *);
 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 *);
-#if HAVE_SQLITE3
-static enum mandoclevel  passthrough(const char *, int, int);
-#endif
-static void              spawn_pager(void);
+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 void              usage(enum argmode) __attribute__((noreturn));
 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 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[])
 {
 
 
 int
 main(int argc, char *argv[])
 {

+       struct manconf   conf;

        struct curparse  curp;
        struct mansearch search;
        struct curparse  curp;
        struct mansearch search;

-       struct manpaths  paths;
+       struct tag_files *tag_files;

        char            *auxpaths;
        char            *defos;
        unsigned char   *uc;
        char            *auxpaths;
        char            *defos;
        unsigned char   *uc;

-#if HAVE_SQLITE3

        struct manpage  *res, *resp;
        char            *conf_file, *defpaths;
        size_t           isec, i, sz;
        struct manpage  *res, *resp;
        char            *conf_file, *defpaths;
        size_t           isec, i, sz;

-       int              prio, best_prio, synopsis_only;
+       int              prio, best_prio;

        char             sec;
        char             sec;

-#endif
-       enum mandoclevel rc, rctmp;
+       enum mandoclevel rctmp;

        enum outmode     outmode;
        int              fd;
        int              show_usage;
        enum outmode     outmode;
        int              fd;
        int              show_usage;

-       int              use_pager;

        int              options;
        int              options;

+       int              use_pager;

        int              c;
 
        int              c;
 

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

                progname = argv[0];
        else
                ++progname;
                progname = argv[0];
        else
                ++progname;


@@ -152,10 +153,8 @@ main(int argc, char *argv[])
 
        /* Search options. */
 
 
        /* Search options. */
 

-       memset(&paths, 0, sizeof(struct manpaths));
-#if HAVE_SQLITE3
+       memset(&conf, 0, sizeof(conf));

        conf_file = defpaths = NULL;
        conf_file = defpaths = NULL;

-#endif

        auxpaths = NULL;
 
        memset(&search, 0, sizeof(struct mansearch));
        auxpaths = NULL;
 
        memset(&search, 0, sizeof(struct mansearch));


@@ -177,14 +176,13 @@ main(int argc, char *argv[])
        memset(&curp, 0, sizeof(struct curparse));
        curp.outtype = OUTT_LOCALE;
        curp.wlevel  = MANDOCLEVEL_BADARG;
        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;
        options = MPARSE_SO | MPARSE_UTF8 | MPARSE_LATIN1;
        defos = NULL;
 
        use_pager = 1;

+       tag_files = NULL;

        show_usage = 0;
        show_usage = 0;

-#if HAVE_SQLITE3
-       synopsis_only = 0;
-#endif

        outmode = OUTMODE_DEF;
 
        while (-1 != (c = getopt(argc, argv,
        outmode = OUTMODE_DEF;
 
        while (-1 != (c = getopt(argc, argv,


@@ -194,9 +192,7 @@ main(int argc, char *argv[])
                        outmode = OUTMODE_ALL;
                        break;
                case 'C':
                        outmode = OUTMODE_ALL;
                        break;
                case 'C':

-#if HAVE_SQLITE3

                        conf_file = optarg;
                        conf_file = optarg;

-#endif

                        break;
                case 'c':
                        use_pager = 0;
                        break;
                case 'c':
                        use_pager = 0;


@@ -205,10 +201,7 @@ main(int argc, char *argv[])
                        search.argmode = ARG_WORD;
                        break;
                case 'h':
                        search.argmode = ARG_WORD;
                        break;
                case 'h':

-                       (void)strlcat(curp.outopts, "synopsis,", BUFSIZ);
-#if HAVE_SQLITE3
-                       synopsis_only = 1;
-#endif
+                       conf.output.synopsisonly = 1;

                        use_pager = 0;
                        outmode = OUTMODE_ALL;
                        break;
                        use_pager = 0;
                        outmode = OUTMODE_ALL;
                        break;


@@ -242,17 +235,16 @@ main(int argc, char *argv[])
                        outmode = OUTMODE_ALL;
                        break;
                case 'M':
                        outmode = OUTMODE_ALL;
                        break;
                case 'M':

-#if HAVE_SQLITE3

                        defpaths = optarg;
                        defpaths = optarg;

-#endif

                        break;
                case 'm':
                        auxpaths = optarg;
                        break;
                case 'O':
                        search.outkey = optarg;
                        break;
                case 'm':
                        auxpaths = optarg;
                        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;
                        break;
                case 'S':
                        search.arch = optarg;


@@ -271,9 +263,6 @@ main(int argc, char *argv[])
                case 'w':
                        outmode = OUTMODE_FLN;
                        break;
                case 'w':
                        outmode = OUTMODE_FLN;
                        break;

-               case 'V':
-                       version();
-                       /* NOTREACHED */

                default:
                        show_usage = 1;
                        break;
                default:
                        show_usage = 1;
                        break;


@@ -302,11 +291,11 @@ main(int argc, char *argv[])
 
        /* Parse arguments. */
 
 
        /* Parse arguments. */
 

-       argc -= optind;
-       argv += optind;
-#if HAVE_SQLITE3
+       if (argc > 0) {
+               argc -= optind;
+               argv += optind;
+       }

        resp = NULL;
        resp = NULL;

-#endif

 
        /*
         * Quirks for help(1)
 
        /*
         * Quirks for help(1)


@@ -320,14 +309,20 @@ main(int argc, char *argv[])
                                argc = 1;
                        }
                } else if (argc > 1 &&
                                argc = 1;
                        }
                } else if (argc > 1 &&

-                   ((uc = argv[0]) != NULL) &&
+                   ((uc = (unsigned char *)argv[0]) != NULL) &&

                    ((isdigit(uc[0]) && (uc[1] == '\0' ||
                      (isalpha(uc[1]) && uc[2] == '\0'))) ||
                     (uc[0] == 'n' && uc[1] == '\0'))) {
                    ((isdigit(uc[0]) && (uc[1] == '\0' ||
                      (isalpha(uc[1]) && uc[2] == '\0'))) ||
                     (uc[0] == 'n' && uc[1] == '\0'))) {

-                       search.sec = uc;
+                       search.sec = (char *)uc;

                        argv++;
                        argc--;
                }
                        argv++;
                        argc--;
                }

+               if (search.arch == NULL)
+                       search.arch = getenv("MACHINE");
+#ifdef MACHINE
+               if (search.arch == NULL)
+                       search.arch = MACHINE;
+#endif

        }
 
        rc = MANDOCLEVEL_OK;
        }
 
        rc = MANDOCLEVEL_OK;


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

-#if HAVE_SQLITE3

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


@@ -345,13 +339,30 @@ main(int argc, char *argv[])
 
                /* Access the mandoc database. */
 
 
                /* Access the mandoc database. */
 

-               manpath_parse(&paths, conf_file, defpaths, auxpaths);
+               manconf_parse(&conf, conf_file, defpaths, auxpaths);
+#if HAVE_SQLITE3

                mansearch_setup(1);
                mansearch_setup(1);

-               if( ! mansearch(&search, &paths, argc, argv, &res, &sz))
+               if ( ! mansearch(&search, &conf.manpath,
+                   argc, argv, &res, &sz))

                        usage(search.argmode);
                        usage(search.argmode);

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

 
 

-               if (sz == 0 && search.argmode == ARG_NAME)
-                       fs_search(&search, &paths, argc, argv, &res, &sz);
+               if (sz == 0) {
+                       if (search.argmode == ARG_NAME)
+                               fs_search(&search, &conf.manpath,
+                                   argc, argv, &res, &sz);
+                       else
+                               fprintf(stderr,
+                                   "%s: nothing appropriate\n",
+                                   progname);
+               }

 
                if (sz == 0) {
                        rc = MANDOCLEVEL_BADARG;
 
                if (sz == 0) {
                        rc = MANDOCLEVEL_BADARG;


@@ -402,11 +413,6 @@ main(int argc, char *argv[])
 
                if (outmode == OUTMODE_FLN || outmode == OUTMODE_LST)
                        goto out;
 
                if (outmode == OUTMODE_FLN || outmode == OUTMODE_LST)
                        goto out;

-#else
-               fputs("mandoc: database support not compiled in\n",
-                   stderr);
-               return((int)MANDOCLEVEL_BADARG);
-#endif

        }
 
        /* mandoc(1) */
        }
 
        /* mandoc(1) */


@@ -414,6 +420,9 @@ main(int argc, char *argv[])
        if (search.argmode == ARG_FILE && ! moptions(&options, auxpaths))
                return((int)MANDOCLEVEL_BADARG);
 
        if (search.argmode == ARG_FILE && ! moptions(&options, auxpaths))
                return((int)MANDOCLEVEL_BADARG);
 

+       if (use_pager && ! isatty(STDOUT_FILENO))
+               use_pager = 0;
+

        curp.mchars = mchars_alloc();
        curp.mp = mparse_alloc(options, curp.wlevel, mmsg,
            curp.mchars, defos);
        curp.mchars = mchars_alloc();
        curp.mp = mparse_alloc(options, curp.wlevel, mmsg,
            curp.mchars, defos);


@@ -424,46 +433,33 @@ main(int argc, char *argv[])
        if (OUTT_MAN == curp.outtype)
                mparse_keep(curp.mp);
 
        if (OUTT_MAN == curp.outtype)
                mparse_keep(curp.mp);
 

-       if (argc == 0) {
-               if (use_pager && isatty(STDOUT_FILENO))
-                       spawn_pager();
-               parse(&curp, STDIN_FILENO, "<stdin>", &rc);
+       if (argc < 1) {
+               if (use_pager)
+                       tag_files = tag_init();
+               parse(&curp, STDIN_FILENO, "<stdin>");

        }
 
        }
 

-       while (argc) {
+       while (argc > 0) {

                rctmp = mparse_open(curp.mp, &fd,
                rctmp = mparse_open(curp.mp, &fd,

-#if HAVE_SQLITE3
-                   resp != NULL ? resp->file :
-#endif
-                   *argv);
+                   resp != NULL ? resp->file : *argv);

                if (rc < rctmp)
                        rc = rctmp;
 
                if (fd != -1) {
                if (rc < rctmp)
                        rc = rctmp;
 
                if (fd != -1) {

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

 
 

-#if HAVE_SQLITE3

                        if (resp == NULL)
                        if (resp == NULL)

-#endif
-                               parse(&curp, fd, *argv, &rc);
-#if HAVE_SQLITE3
+                               parse(&curp, fd, *argv);

                        else if (resp->form & FORM_SRC) {
                                /* For .so only; ignore failure. */
                        else if (resp->form & FORM_SRC) {
                                /* For .so only; ignore failure. */

-                               chdir(paths.paths[resp->ipath]);
-                               parse(&curp, fd, resp->file, &rc);
-                       } else {
-                               rctmp = passthrough(resp->file, fd,
-                                   synopsis_only);
-                               if (rc < rctmp)
-                                       rc = rctmp;
-                       }
-#endif
-
-                       rctmp = mparse_wait(curp.mp);
-                       if (rc < rctmp)
-                               rc = rctmp;
+                               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)
                                ascii_sepline(curp.outdata);
 
                        if (argc > 1 && curp.outtype <= OUTT_UTF8)
                                ascii_sepline(curp.outdata);


@@ -472,11 +468,9 @@ main(int argc, char *argv[])
                if (MANDOCLEVEL_OK != rc && curp.wstop)
                        break;
 
                if (MANDOCLEVEL_OK != rc && curp.wstop)
                        break;
 

-#if HAVE_SQLITE3

                if (resp != NULL)
                        resp++;
                else
                if (resp != NULL)
                        resp++;
                else

-#endif

                        argv++;
                if (--argc)
                        mparse_reset(curp.mp);
                        argv++;
                if (--argc)
                        mparse_reset(curp.mp);


@@ -487,26 +481,30 @@ main(int argc, char *argv[])
        mparse_free(curp.mp);
        mchars_free(curp.mchars);
 
        mparse_free(curp.mp);
        mchars_free(curp.mchars);
 

-#if HAVE_SQLITE3

 out:
        if (search.argmode != ARG_FILE) {
 out:
        if (search.argmode != ARG_FILE) {

-               manpath_free(&paths);
+               manconf_free(&conf);
+#if HAVE_SQLITE3

                mansearch_free(res, sz);
                mansearch_setup(0);
                mansearch_free(res, sz);
                mansearch_setup(0);

-       }

 #endif
 #endif

+       }

 
        free(defos);
 
 
        free(defos);
 

-       return((int)rc);
-}
+       /*
+        * When using a pager, finish writing both temporary files,
+        * fork it, wait for the user to close it, and clean up.
+        */

 
 

-static void
-version(void)
-{
+       if (tag_files != NULL) {
+               fclose(stdout);
+               tag_write();
+               waitpid(spawn_pager(tag_files), NULL, 0);
+               tag_unlink();
+       }

 
 

-       printf("mandoc %s\n", VERSION);
-       exit((int)MANDOCLEVEL_OK);
+       return((int)rc);

 }
 
 static void
 }
 
 static void


@@ -515,24 +513,24 @@ usage(enum argmode argmode)
 
        switch (argmode) {
        case ARG_FILE:
 
        switch (argmode) {
        case ARG_FILE:

-               fputs("usage: mandoc [-acfhklV] [-Ios=name] "
-                   "[-Kencoding] [-mformat] [-Ooption]\n"
-                   "\t      [-Toutput] [-Wlevel] [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:
                break;
        case ARG_NAME:

-               fputs("usage: man [-acfhklVw] [-C file] [-I os=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:
                    "[-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 [-acfhklVw] [-C file] "
+               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:
                    "[-M path] [-m path] [-O outkey] [-S arch]\n"
                    "\t      [-s section] name ...\n", stderr);
                break;
        case ARG_EXPR:

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

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


@@ -540,22 +538,21 @@ usage(enum argmode argmode)
        exit((int)MANDOCLEVEL_BADARG);
 }
 
        exit((int)MANDOCLEVEL_BADARG);
 }
 

-#if HAVE_SQLITE3

 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)
 {
 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;
        struct manpage  *page;
        char            *file;

-       int              form;
+       int              form, globres;

 
 

+       form = FORM_SRC;

        mandoc_asprintf(&file, "%s/man%s/%s.%s",
            paths->paths[ipath], sec, name, sec);
        mandoc_asprintf(&file, "%s/man%s/%s.%s",
            paths->paths[ipath], sec, name, sec);

-       if (access(file, R_OK) != -1) {
-               form = FORM_SRC;
+       if (access(file, R_OK) != -1)

                goto found;
                goto found;

-       }

        free(file);
 
        mandoc_asprintf(&file, "%s/cat%s/%s.0",
        free(file);
 
        mandoc_asprintf(&file, "%s/cat%s/%s.0",


@@ -569,19 +566,29 @@ fs_lookup(const struct manpaths *paths, size_t ipath,
        if (arch != NULL) {
                mandoc_asprintf(&file, "%s/man%s/%s/%s.%s",
                    paths->paths[ipath], sec, arch, name, sec);
        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) {
-                       form = FORM_SRC;
+               if (access(file, R_OK) != -1)

                        goto found;
                        goto found;

-               }

                free(file);
        }
                free(file);
        }

-       return(0);
+
+       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)
+               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:
 
 found:

-       fprintf(stderr, "%s: outdated mandoc.db lacks %s(%s) entry,\n"
-           "     consider running  # makewhatis %s\n",
-           progname, name, sec, paths->paths[ipath]);
-       
+#if HAVE_SQLITE3
+       fprintf(stderr, "%s: outdated mandoc.db lacks %s(%s) entry, run "
+           "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;
        *res = mandoc_reallocarray(*res, ++*ressz, sizeof(struct manpage));
        page = *res + (*ressz - 1);
        page->file = file;


@@ -630,30 +637,29 @@ fs_search(const struct mansearch *cfg, const struct manpaths *paths,
                argc--;
        }
 }
                argc--;
        }
 }

-#endif

 
 static void
 
 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;
-       struct mdoc      *mdoc;
-       struct man       *man;
+       enum mandoclevel  rctmp;
+       struct roff_man  *man;

 
        /* Begin by parsing the file itself. */
 
        assert(file);
        assert(fd >= -1);
 
 
        /* Begin by parsing the file itself. */
 
        assert(file);
        assert(fd >= -1);
 

-       rc = mparse_readfd(curp->mp, fd, file);
+       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.
         */
 
 
        /*
         * 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 unset, allocate output dev now (if applicable). */
 


@@ -723,22 +729,19 @@ parse(struct curparse *curp, int fd, const char *file,
                }
        }
 
                }
        }
 

-       mparse_result(curp->mp, &mdoc, &man, NULL);
+       mparse_result(curp->mp, &man, NULL);

 
        /* Execute the out device, if it exists. */
 
 
        /* Execute the out device, if it exists. */
 

-       if (man && curp->outman)
+       if (man == NULL)
+               return;
+       if (curp->outmdoc != NULL && man->macroset == MACROSET_MDOC)
+               (*curp->outmdoc)(curp->outdata, man);
+       if (curp->outman != NULL && man->macroset == MACROSET_MAN)

                (*curp->outman)(curp->outdata, man);
                (*curp->outman)(curp->outdata, man);

-       if (mdoc && curp->outmdoc)
-               (*curp->outmdoc)(curp->outdata, mdoc);
-
-cleanup:
-       if (*level < rc)
-               *level = rc;

 }
 
 }
 

-#if HAVE_SQLITE3
-static enum mandoclevel
+static void

 passthrough(const char *file, int fd, int synopsis_only)
 {
        const char       synb[] = "S\bSY\bYN\bNO\bOP\bPS\bSI\bIS\bS";
 passthrough(const char *file, int fd, int synopsis_only)
 {
        const char       synb[] = "S\bSY\bYN\bNO\bOP\bPS\bSI\bIS\bS";


@@ -796,14 +799,14 @@ passthrough(const char *file, int fd, int synopsis_only)
 
 done:
        fclose(stream);
 
 done:
        fclose(stream);

-       return(MANDOCLEVEL_OK);
+       return;

 
 fail:
        fprintf(stderr, "%s: %s: SYSERR: %s: %s",
            progname, file, syscall, strerror(errno));
 
 fail:
        fprintf(stderr, "%s: %s: SYSERR: %s: %s",
            progname, file, syscall, strerror(errno));

-       return(MANDOCLEVEL_SYSERR);
+       if (rc < MANDOCLEVEL_SYSERR)
+               rc = MANDOCLEVEL_SYSERR;

 }
 }

-#endif

 
 static int
 koptions(int *options, char *arg)
 
 static int
 koptions(int *options, char *arg)


@@ -884,14 +887,15 @@ static int
 woptions(struct curparse *curp, char *arg)
 {
        char            *v, *o;
 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[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;
 
        while (*arg) {
                o = arg;


@@ -908,6 +912,9 @@ woptions(struct curparse *curp, char *arg)
                        curp->wlevel = MANDOCLEVEL_ERROR;
                        break;
                case 4:
                        curp->wlevel = MANDOCLEVEL_ERROR;
                        break;
                case 4:

+                       curp->wlevel = MANDOCLEVEL_UNSUPP;
+                       break;
+               case 5:

                        curp->wlevel = MANDOCLEVEL_BADARG;
                        break;
                default:
                        curp->wlevel = MANDOCLEVEL_BADARG;
                        break;
                default:


@@ -942,53 +949,22 @@ mmsg(enum mandocerr t, enum mandoclevel lvl,
        fputc('\n', stderr);
 }
 
        fputc('\n', stderr);
 }
 

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

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

-       int              fildes[2];
+       size_t           cmdlen;

        int              argc;
        int              argc;

-
-       if (pipe(fildes) == -1) {
-               fprintf(stderr, "%s: pipe: %s\n",
-                   progname, strerror(errno));
-               return;
-       }
-
-       switch (fork()) {
-       case -1:
-               fprintf(stderr, "%s: fork: %s\n",
-                   progname, strerror(errno));
-               exit((int)MANDOCLEVEL_SYSERR);
-       case 0:
-               close(fildes[0]);
-               if (dup2(fildes[1], STDOUT_FILENO) == -1) {
-                       fprintf(stderr, "%s: dup output: %s\n",
-                           progname, strerror(errno));
-                       exit((int)MANDOCLEVEL_SYSERR);
-               }
-               return;
-       default:
-               break;
-       }
-
-       /* The original 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);
-       }
+       pid_t            pager_pid;

 
        pager = getenv("MANPAGER");
        if (pager == NULL || *pager == '\0')
                pager = getenv("PAGER");
        if (pager == NULL || *pager == '\0')
 
        pager = getenv("MANPAGER");
        if (pager == NULL || *pager == '\0')
                pager = getenv("PAGER");
        if (pager == NULL || *pager == '\0')

-               pager = "/usr/bin/more -s";
+               pager = "more -s";

        cp = mandoc_strdup(pager);
 
        /*
        cp = mandoc_strdup(pager);
 
        /*


@@ -997,7 +973,7 @@ spawn_pager(void)
         */
 
        argc = 0;
         */
 
        argc = 0;

-       while (argc + 1 < MAX_PAGER_ARGS) {
+       while (argc + 4 < MAX_PAGER_ARGS) {

                argv[argc++] = cp;
                cp = strchr(cp, ' ');
                if (cp == NULL)
                argv[argc++] = cp;
                cp = strchr(cp, ' ');
                if (cp == NULL)


@@ -1008,12 +984,40 @@ spawn_pager(void)
                if (*cp == '\0')
                        break;
        }
                if (*cp == '\0')
                        break;
        }

+
+       /* For more(1) and less(1), use the tag file. */
+
+       if ((cmdlen = strlen(argv[0])) >= 4) {
+               cp = argv[0] + cmdlen - 4;
+               if (strcmp(cp, "less") == 0 || strcmp(cp, "more") == 0) {
+                       argv[argc++] = mandoc_strdup("-T");
+                       argv[argc++] = tag_files->tfn;
+               }
+       }
+       argv[argc++] = tag_files->ofn;

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

-       /* Hand over to the pager. */
+       switch (pager_pid = fork()) {
+       case -1:
+               fprintf(stderr, "%s: fork: %s\n",
+                   progname, strerror(errno));
+               exit((int)MANDOCLEVEL_SYSERR);
+       case 0:
+               break;
+       default:
+               return(pager_pid);
+       }
+
+       /* The child process becomes the pager. */

 
 

+       if (dup2(tag_files->ofd, STDOUT_FILENO) == -1) {
+               fprintf(stderr, "pager: stdout: %s\n", strerror(errno));
+               exit((int)MANDOCLEVEL_SYSERR);
+       }
+       close(tag_files->ofd);
+       close(tag_files->tfd);

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

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

        exit((int)MANDOCLEVEL_SYSERR);
 }
        exit((int)MANDOCLEVEL_SYSERR);
 }