]> git.cameronkatri.com Git - mandoc.git/blobdiff - mandocdb.c
git.ckatri.com / mandoc.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
unify names of AST node flags; no change of cpp output
[mandoc.git] / mandocdb.c
diff --git a/mandocdb.c b/mandocdb.c
index 0fc16443601df6d018e74442852ab9a04df14112..f576328d8c2030d64303e2534da92b12715d0c83 100644 (file)
--- a/mandocdb.c
+++ b/mandocdb.c
@@ -1,34 +1,44 @@
-/*     $Id: mandocdb.c,v 1.141 2014/04/20 16:46:04 schwarze Exp $ */
+/*     $Id: mandocdb.c,v 1.234 2016/10/22 10:09:27 schwarze Exp $ */
 /*
  * Copyright (c) 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
 /*
  * Copyright (c) 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
- * Copyright (c) 2011, 2012, 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2011-2016 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2016 Ed Maste <emaste@freebsd.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/types.h>
 #include <sys/stat.h>
 #include <sys/wait.h>
 
 #include <assert.h>
 #include <ctype.h>
 #include <sys/stat.h>
 #include <sys/wait.h>
 
 #include <assert.h>
 #include <ctype.h>
+#if HAVE_ERR
+#include <err.h>
+#endif
 #include <errno.h>
 #include <fcntl.h>
 #include <errno.h>
 #include <fcntl.h>
+#if HAVE_FTS
 #include <fts.h>
 #include <fts.h>
-#include <getopt.h>
+#else
+#include "compat_fts.h"
+#endif
 #include <limits.h>
 #include <limits.h>
+#if HAVE_SANDBOX_INIT
+#include <sandbox.h>
+#endif
+#include <stdarg.h>
 #include <stddef.h>
 #include <stdio.h>
 #include <stdint.h>
 #include <stddef.h>
 #include <stdio.h>
 #include <stdint.h>
@@ -36,42 +46,19 @@
 #include <string.h>
 #include <unistd.h>
 
 #include <string.h>
 #include <unistd.h>
 
-#ifdef HAVE_OHASH
-#include <ohash.h>
-#else
-#include "compat_ohash.h"
-#endif
-#include <sqlite3.h>
-
+#include "mandoc_aux.h"
+#include "mandoc_ohash.h"
+#include "mandoc.h"
+#include "roff.h"
 #include "mdoc.h"
 #include "man.h"
 #include "mdoc.h"
 #include "man.h"
-#include "mandoc.h"
-#include "mandoc_aux.h"
-#include "manpath.h"
+#include "manconf.h"
 #include "mansearch.h"
 #include "mansearch.h"
+#include "dba_array.h"
+#include "dba.h"
 
 
-extern int mansearch_keymax;
 extern const char *const mansearch_keynames[];
 
 extern const char *const mansearch_keynames[];
 
-#define        SQL_EXEC(_v) \
-       if (SQLITE_OK != sqlite3_exec(db, (_v), NULL, NULL, NULL)) \
-               say("", "%s: %s", (_v), sqlite3_errmsg(db))
-#define        SQL_BIND_TEXT(_s, _i, _v) \
-       if (SQLITE_OK != sqlite3_bind_text \
-               ((_s), (_i)++, (_v), -1, SQLITE_STATIC)) \
-               say(mlink->file, "%s", sqlite3_errmsg(db))
-#define        SQL_BIND_INT(_s, _i, _v) \
-       if (SQLITE_OK != sqlite3_bind_int \
-               ((_s), (_i)++, (_v))) \
-               say(mlink->file, "%s", sqlite3_errmsg(db))
-#define        SQL_BIND_INT64(_s, _i, _v) \
-       if (SQLITE_OK != sqlite3_bind_int64 \
-               ((_s), (_i)++, (_v))) \
-               say(mlink->file, "%s", sqlite3_errmsg(db))
-#define SQL_STEP(_s) \
-       if (SQLITE_DONE != sqlite3_step((_s))) \
-               say(mlink->file, "%s", sqlite3_errmsg(db))
-
 enum   op {
        OP_DEFAULT = 0, /* new dbs from dir list or default config */
        OP_CONFFILE, /* new databases from custom config file */
 enum   op {
        OP_DEFAULT = 0, /* new dbs from dir list or default config */
        OP_CONFFILE, /* new databases from custom config file */
@@ -80,17 +67,10 @@ enum        op {
        OP_TEST /* change no databases, report potential problems */
 };
 
        OP_TEST /* change no databases, report potential problems */
 };
 
-enum   form {
-       FORM_NONE,  /* format is unknown */
-       FORM_SRC,   /* format is -man or -mdoc */
-       FORM_CAT    /* format is cat */
-};
-
 struct str {
 struct str {
-       char            *rendered; /* key in UTF-8 or ASCII form */
        const struct mpage *mpage; /* if set, the owning parse */
        uint64_t         mask; /* bitmask in sequence */
        const struct mpage *mpage; /* if set, the owning parse */
        uint64_t         mask; /* bitmask in sequence */
-       char             key[]; /* may contain escape sequences */
+       char             key[]; /* rendered text */
 };
 
 struct inodev {
 };
 
 struct inodev {
@@ -100,19 +80,19 @@ struct     inodev {
 
 struct mpage {
        struct inodev    inodev;  /* used for hashing routine */
 
 struct mpage {
        struct inodev    inodev;  /* used for hashing routine */
-       int64_t          pageid;  /* pageid in mpages SQL table */
-       enum form        form;    /* format from file content */
+       struct dba_array *dba;
        char            *sec;     /* section from file content */
        char            *arch;    /* architecture from file content */
        char            *title;   /* title from file content */
        char            *desc;    /* description from file content */
        char            *sec;     /* section from file content */
        char            *arch;    /* architecture from file content */
        char            *title;   /* title from file content */
        char            *desc;    /* description from file content */
+       struct mpage    *next;    /* singly linked list */
        struct mlink    *mlinks;  /* singly linked list */
        struct mlink    *mlinks;  /* singly linked list */
+       int              name_head_done;
+       enum form        form;    /* format from file content */
 };
 
 struct mlink {
        char             file[PATH_MAX]; /* filename rel. to manpath */
 };
 
 struct mlink {
        char             file[PATH_MAX]; /* filename rel. to manpath */
-       enum form        dform;   /* format from directory */
-       enum form        fform;   /* format from file name suffix */
        char            *dsec;    /* section from directory */
        char            *arch;    /* architecture from directory */
        char            *name;    /* name from file name (not empty) */
        char            *dsec;    /* section from directory */
        char            *arch;    /* architecture from directory */
        char            *name;    /* name from file name (not empty) */
@@ -120,64 +100,72 @@ struct    mlink {
        struct mlink    *next;    /* singly linked list */
        struct mpage    *mpage;   /* parent */
        int              gzip;    /* filename has a .gz suffix */
        struct mlink    *next;    /* singly linked list */
        struct mpage    *mpage;   /* parent */
        int              gzip;    /* filename has a .gz suffix */
+       enum form        dform;   /* format from directory */
+       enum form        fform;   /* format from file name suffix */
 };
 
 };
 
-enum   stmt {
-       STMT_DELETE_PAGE = 0,   /* delete mpage */
-       STMT_INSERT_PAGE,       /* insert mpage */
-       STMT_INSERT_LINK,       /* insert mlink */
-       STMT_INSERT_NAME,       /* insert name */
-       STMT_INSERT_KEY,        /* insert parsed key */
-       STMT__MAX
-};
-
-typedef        int (*mdoc_fp)(struct mpage *, const struct mdoc_node *);
+typedef        int (*mdoc_fp)(struct mpage *, const struct roff_meta *,
+                       const struct roff_node *);
 
 struct mdoc_handler {
        mdoc_fp          fp; /* optional handler */
        uint64_t         mask;  /* set unless handler returns 0 */
 };
 
 
 struct mdoc_handler {
        mdoc_fp          fp; /* optional handler */
        uint64_t         mask;  /* set unless handler returns 0 */
 };
 
-static void     dbclose(int);
-static void     dbadd(struct mpage *, struct mchars *);
+
+int             mandocdb(int, char *[]);
+
+static void     dbadd(struct dba *, struct mpage *);
 static void     dbadd_mlink(const struct mlink *mlink);
 static void     dbadd_mlink(const struct mlink *mlink);
-static int      dbopen(int);
-static void     dbprune(void);
+static void     dbprune(struct dba *);
+static void     dbwrite(struct dba *);
 static void     filescan(const char *);
 static void     filescan(const char *);
-static void    *hash_alloc(size_t, void *);
-static void     hash_free(void *, size_t, void *);
-static void    *hash_halloc(size_t, void *);
+#if HAVE_FTS_COMPARE_CONST
+static int      fts_compare(const FTSENT *const *, const FTSENT *const *);
+#else
+static int      fts_compare(const FTSENT **, const FTSENT **);
+#endif
 static void     mlink_add(struct mlink *, const struct stat *);
 static void     mlink_check(struct mpage *, struct mlink *);
 static void     mlink_free(struct mlink *);
 static void     mlinks_undupe(struct mpage *);
 static void     mpages_free(void);
 static void     mlink_add(struct mlink *, const struct stat *);
 static void     mlink_check(struct mpage *, struct mlink *);
 static void     mlink_free(struct mlink *);
 static void     mlinks_undupe(struct mpage *);
 static void     mpages_free(void);
-static void     mpages_merge(struct mchars *, struct mparse *);
-static void     names_check(void);
+static void     mpages_merge(struct dba *, struct mparse *);
 static void     parse_cat(struct mpage *, int);
 static void     parse_cat(struct mpage *, int);
-static void     parse_man(struct mpage *, const struct man_node *);
-static void     parse_mdoc(struct mpage *, const struct mdoc_node *);
-static int      parse_mdoc_body(struct mpage *, const struct mdoc_node *);
-static int      parse_mdoc_head(struct mpage *, const struct mdoc_node *);
-static int      parse_mdoc_Fd(struct mpage *, const struct mdoc_node *);
-static int      parse_mdoc_Fn(struct mpage *, const struct mdoc_node *);
-static int      parse_mdoc_Nd(struct mpage *, const struct mdoc_node *);
-static int      parse_mdoc_Nm(struct mpage *, const struct mdoc_node *);
-static int      parse_mdoc_Sh(struct mpage *, const struct mdoc_node *);
-static int      parse_mdoc_Xr(struct mpage *, const struct mdoc_node *);
+static void     parse_man(struct mpage *, const struct roff_meta *,
+                       const struct roff_node *);
+static void     parse_mdoc(struct mpage *, const struct roff_meta *,
+                       const struct roff_node *);
+static int      parse_mdoc_head(struct mpage *, const struct roff_meta *,
+                       const struct roff_node *);
+static int      parse_mdoc_Fd(struct mpage *, const struct roff_meta *,
+                       const struct roff_node *);
+static void     parse_mdoc_fname(struct mpage *, const struct roff_node *);
+static int      parse_mdoc_Fn(struct mpage *, const struct roff_meta *,
+                       const struct roff_node *);
+static int      parse_mdoc_Fo(struct mpage *, const struct roff_meta *,
+                       const struct roff_node *);
+static int      parse_mdoc_Nd(struct mpage *, const struct roff_meta *,
+                       const struct roff_node *);
+static int      parse_mdoc_Nm(struct mpage *, const struct roff_meta *,
+                       const struct roff_node *);
+static int      parse_mdoc_Sh(struct mpage *, const struct roff_meta *,
+                       const struct roff_node *);
+static int      parse_mdoc_Va(struct mpage *, const struct roff_meta *,
+                       const struct roff_node *);
+static int      parse_mdoc_Xr(struct mpage *, const struct roff_meta *,
+                       const struct roff_node *);
 static void     putkey(const struct mpage *, char *, uint64_t);
 static void     putkey(const struct mpage *, char *, uint64_t);
-static void     putkeys(const struct mpage *,
-                       const char *, size_t, uint64_t);
+static void     putkeys(const struct mpage *, char *, size_t, uint64_t);
 static void     putmdockey(const struct mpage *,
 static void     putmdockey(const struct mpage *,
-                       const struct mdoc_node *, uint64_t);
-static void     render_key(struct mchars *, struct str *);
-static void     say(const char *, const char *, ...);
-static int      set_basedir(const char *);
+                       const struct roff_node *, uint64_t);
+static int      render_string(char **, size_t *);
+static void     say(const char *, const char *, ...)
+                       __attribute__((__format__ (printf, 2, 3)));
+static int      set_basedir(const char *, int);
 static int      treescan(void);
 static size_t   utf8(unsigned int, char [7]);
 
 static int      treescan(void);
 static size_t   utf8(unsigned int, char [7]);
 
-static char             tempfilename[32];
-static char            *progname;
 static int              nodb; /* no database changes */
 static int              mparse_options; /* abort the parse early */
 static int              use_all; /* use all found files */
 static int              nodb; /* no database changes */
 static int              mparse_options; /* abort the parse early */
 static int              use_all; /* use all found files */
@@ -187,12 +175,11 @@ static    int              write_utf8; /* write UTF-8 output; else ASCII */
 static int              exitcode; /* to be returned by main */
 static enum op          op; /* operational mode */
 static char             basedir[PATH_MAX]; /* current base directory */
 static int              exitcode; /* to be returned by main */
 static enum op          op; /* operational mode */
 static char             basedir[PATH_MAX]; /* current base directory */
+static struct mpage    *mpage_head; /* list of distinct manual pages */
 static struct ohash     mpages; /* table of distinct manual pages */
 static struct ohash     mlinks; /* table of directory entries */
 static struct ohash     names; /* table of all names */
 static struct ohash     strings; /* table of all strings */
 static struct ohash     mpages; /* table of distinct manual pages */
 static struct ohash     mlinks; /* table of directory entries */
 static struct ohash     names; /* table of all names */
 static struct ohash     strings; /* table of all strings */
-static sqlite3         *db = NULL; /* current database */
-static sqlite3_stmt    *stmts[STMT__MAX]; /* current statements */
 static uint64_t         name_mask;
 
 static const struct mdoc_handler mdocs[MDOC_MAX] = {
 static uint64_t         name_mask;
 
 static const struct mdoc_handler mdocs[MDOC_MAX] = {
@@ -234,8 +221,8 @@ static      const struct mdoc_handler mdocs[MDOC_MAX] = {
        { NULL, TYPE_Pa },  /* Pa */
        { NULL, 0 },  /* Rv */
        { NULL, TYPE_St },  /* St */
        { NULL, TYPE_Pa },  /* Pa */
        { NULL, 0 },  /* Rv */
        { NULL, TYPE_St },  /* St */
-       { NULL, TYPE_Va },  /* Va */
-       { parse_mdoc_body, TYPE_Va },  /* Vt */
+       { parse_mdoc_Va, TYPE_Va },  /* Va */
+       { parse_mdoc_Va, TYPE_Vt },  /* Vt */
        { parse_mdoc_Xr, 0 },  /* Xr */
        { NULL, 0 },  /* %A */
        { NULL, 0 },  /* %B */
        { parse_mdoc_Xr, 0 },  /* Xr */
        { NULL, 0 },  /* %A */
        { NULL, 0 },  /* %B */
@@ -292,7 +279,7 @@ static      const struct mdoc_handler mdocs[MDOC_MAX] = {
        { NULL, 0 },  /* Ux */
        { NULL, 0 },  /* Xc */
        { NULL, 0 },  /* Xo */
        { NULL, 0 },  /* Ux */
        { NULL, 0 },  /* Xc */
        { NULL, 0 },  /* Xo */
-       { parse_mdoc_head, 0 },  /* Fo */
+       { parse_mdoc_Fo, 0 },  /* Fo */
        { NULL, 0 },  /* Fc */
        { NULL, 0 },  /* Oo */
        { NULL, 0 },  /* Oc */
        { NULL, 0 },  /* Fc */
        { NULL, 0 },  /* Oo */
        { NULL, 0 },  /* Oc */
@@ -318,35 +305,35 @@ static    const struct mdoc_handler mdocs[MDOC_MAX] = {
        { NULL, 0 },  /* sp */
        { NULL, 0 },  /* %U */
        { NULL, 0 },  /* Ta */
        { NULL, 0 },  /* sp */
        { NULL, 0 },  /* %U */
        { NULL, 0 },  /* Ta */
+       { NULL, 0 },  /* ll */
 };
 
 
 int
 };
 
 
 int
-main(int argc, char *argv[])
+mandocdb(int argc, char *argv[])
 {
 {
-       int               ch, i;
-       size_t            j, sz;
-       const char       *path_arg;
-       struct mchars    *mc;
-       struct manpaths   dirs;
+       struct manconf    conf;
        struct mparse    *mp;
        struct mparse    *mp;
-       struct ohash_info mpages_info, mlinks_info;
-
-       memset(stmts, 0, STMT__MAX * sizeof(sqlite3_stmt *));
-       memset(&dirs, 0, sizeof(struct manpaths));
+       struct dba       *dba;
+       const char       *path_arg, *progname;
+       size_t            j, sz;
+       int               ch, i;
 
 
-       mpages_info.alloc  = mlinks_info.alloc  = hash_alloc;
-       mpages_info.halloc = mlinks_info.halloc = hash_halloc;
-       mpages_info.hfree  = mlinks_info.hfree  = hash_free;
+#if HAVE_PLEDGE
+       if (pledge("stdio rpath wpath cpath fattr flock proc exec", NULL) == -1) {
+               warn("pledge");
+               return (int)MANDOCLEVEL_SYSERR;
+       }
+#endif
 
 
-       mpages_info.key_offset = offsetof(struct mpage, inodev);
-       mlinks_info.key_offset = offsetof(struct mlink, file);
+#if HAVE_SANDBOX_INIT
+       if (sandbox_init(kSBXProfileNoInternet, SANDBOX_NAMED, NULL) == -1) {
+               warnx("sandbox_init");
+               return (int)MANDOCLEVEL_SYSERR;
+       }
+#endif
 
 
-       progname = strrchr(argv[0], '/');
-       if (progname == NULL)
-               progname = argv[0];
-       else
-               ++progname;
+       memset(&conf, 0, sizeof(conf));
 
        /*
         * We accept a few different invocations.
 
        /*
         * We accept a few different invocations.
@@ -355,7 +342,7 @@ main(int argc, char *argv[])
         */
 #define        CHECKOP(_op, _ch) do \
        if (OP_DEFAULT != (_op)) { \
         */
 #define        CHECKOP(_op, _ch) do \
        if (OP_DEFAULT != (_op)) { \
-               fprintf(stderr, "-%c: Conflicting option\n", (_ch)); \
+               warnx("-%c: Conflicting option", (_ch)); \
                goto usage; \
        } while (/*CONSTCOND*/0)
 
                goto usage; \
        } while (/*CONSTCOND*/0)
 
@@ -391,8 +378,8 @@ main(int argc, char *argv[])
                        break;
                case 'T':
                        if (strcmp(optarg, "utf8")) {
                        break;
                case 'T':
                        if (strcmp(optarg, "utf8")) {
-                               fprintf(stderr, "-T%s: Unsupported "
-                                   "output format\n", optarg);
+                               warnx("-T%s: Unsupported output format",
+                                   optarg);
                                goto usage;
                        }
                        write_utf8 = 1;
                                goto usage;
                        }
                        write_utf8 = 1;
@@ -418,68 +405,86 @@ main(int argc, char *argv[])
        argc -= optind;
        argv += optind;
 
        argc -= optind;
        argv += optind;
 
+#if HAVE_PLEDGE
+       if (nodb) {
+               if (pledge("stdio rpath", NULL) == -1) {
+                       warn("pledge");
+                       return (int)MANDOCLEVEL_SYSERR;
+               }
+       }
+#endif
+
        if (OP_CONFFILE == op && argc > 0) {
        if (OP_CONFFILE == op && argc > 0) {
-               fprintf(stderr, "-C: Too many arguments\n");
+               warnx("-C: Too many arguments");
                goto usage;
        }
 
        exitcode = (int)MANDOCLEVEL_OK;
                goto usage;
        }
 
        exitcode = (int)MANDOCLEVEL_OK;
-       mp = mparse_alloc(mparse_options, MANDOCLEVEL_FATAL, NULL, NULL);
-       mc = mchars_alloc();
-
-       ohash_init(&mpages, 6, &mpages_info);
-       ohash_init(&mlinks, 6, &mlinks_info);
+       mchars_alloc();
+       mp = mparse_alloc(mparse_options, MANDOCLEVEL_BADARG, NULL, NULL);
+       mandoc_ohash_init(&mpages, 6, offsetof(struct mpage, inodev));
+       mandoc_ohash_init(&mlinks, 6, offsetof(struct mlink, file));
 
        if (OP_UPDATE == op || OP_DELETE == op || OP_TEST == op) {
 
                /*
 
        if (OP_UPDATE == op || OP_DELETE == op || OP_TEST == op) {
 
                /*
-                * All of these deal with a specific directory.
+                * Most of these deal with a specific directory.
                 * Jump into that directory first.
                 */
                 * Jump into that directory first.
                 */
-               if (0 == set_basedir(path_arg))
+               if (OP_TEST != op && 0 == set_basedir(path_arg, 1))
                        goto out;
 
                        goto out;
 
-               if (dbopen(1)) {
+               dba = nodb ? dba_new(128) : dba_read(MANDOC_DB);
+               if (dba != NULL) {
                        /*
                         * The existing database is usable.  Process
                         * all files specified on the command-line.
                         */
                        /*
                         * The existing database is usable.  Process
                         * all files specified on the command-line.
                         */
+#if HAVE_PLEDGE
+                       if (!nodb) {
+                               if (pledge("stdio rpath wpath cpath fattr flock", NULL) == -1) {
+                                       warn("pledge");
+                                       exitcode = (int)MANDOCLEVEL_SYSERR;
+                                       goto out;
+                               }
+                       }
+#endif
                        use_all = 1;
                        for (i = 0; i < argc; i++)
                                filescan(argv[i]);
                        use_all = 1;
                        for (i = 0; i < argc; i++)
                                filescan(argv[i]);
-                       if (OP_TEST != op)
-                               dbprune();
+                       if (nodb == 0)
+                               dbprune(dba);
                } else {
                } else {
-                       /*
-                        * Database missing or corrupt.
-                        * Recreate from scratch.
-                        */
+                       /* Database missing or corrupt. */
+                       if (op != OP_UPDATE || errno != ENOENT)
+                               say(MANDOC_DB, "%s: Automatically recreating"
+                                   " from scratch", strerror(errno));
                        exitcode = (int)MANDOCLEVEL_OK;
                        op = OP_DEFAULT;
                        if (0 == treescan())
                                goto out;
                        exitcode = (int)MANDOCLEVEL_OK;
                        op = OP_DEFAULT;
                        if (0 == treescan())
                                goto out;
-                       if (0 == dbopen(0))
-                               goto out;
+                       dba = dba_new(128);
                }
                if (OP_DELETE != op)
                }
                if (OP_DELETE != op)
-                       mpages_merge(mc, mp);
-               dbclose(OP_DEFAULT == op ? 0 : 1);
+                       mpages_merge(dba, mp);
+               if (nodb == 0)
+                       dbwrite(dba);
+               dba_free(dba);
        } else {
                /*
                 * If we have arguments, use them as our manpaths.
        } else {
                /*
                 * If we have arguments, use them as our manpaths.
-                * If we don't, grok from manpath(1) or however else
-                * manpath_parse() wants to do it.
+                * If we don't, use man.conf(5).
                 */
                if (argc > 0) {
                 */
                if (argc > 0) {
-                       dirs.paths = mandoc_calloc(argc,
-                           sizeof(char *));
-                       dirs.sz = (size_t)argc;
+                       conf.manpath.paths = mandoc_reallocarray(NULL,
+                           argc, sizeof(char *));
+                       conf.manpath.sz = (size_t)argc;
                        for (i = 0; i < argc; i++)
                        for (i = 0; i < argc; i++)
-                               dirs.paths[i] = mandoc_strdup(argv[i]);
+                               conf.manpath.paths[i] = mandoc_strdup(argv[i]);
                } else
                } else
-                       manpath_parse(&dirs, path_arg, NULL, NULL);
+                       manconf_parse(&conf, path_arg, NULL, NULL);
 
 
-               if (0 == dirs.sz) {
+               if (conf.manpath.sz == 0) {
                        exitcode = (int)MANDOCLEVEL_BADARG;
                        say("", "Empty manpath");
                }
                        exitcode = (int)MANDOCLEVEL_BADARG;
                        say("", "Empty manpath");
                }
@@ -490,34 +495,31 @@ main(int argc, char *argv[])
                 * Ignore zero-length directories and strip trailing
                 * slashes.
                 */
                 * Ignore zero-length directories and strip trailing
                 * slashes.
                 */
-               for (j = 0; j < dirs.sz; j++) {
-                       sz = strlen(dirs.paths[j]);
-                       if (sz && '/' == dirs.paths[j][sz - 1])
-                               dirs.paths[j][--sz] = '\0';
+               for (j = 0; j < conf.manpath.sz; j++) {
+                       sz = strlen(conf.manpath.paths[j]);
+                       if (sz && conf.manpath.paths[j][sz - 1] == '/')
+                               conf.manpath.paths[j][--sz] = '\0';
                        if (0 == sz)
                                continue;
 
                        if (j) {
                        if (0 == sz)
                                continue;
 
                        if (j) {
-                               ohash_init(&mpages, 6, &mpages_info);
-                               ohash_init(&mlinks, 6, &mlinks_info);
+                               mandoc_ohash_init(&mpages, 6,
+                                   offsetof(struct mpage, inodev));
+                               mandoc_ohash_init(&mlinks, 6,
+                                   offsetof(struct mlink, file));
                        }
 
                        }
 
-                       if (0 == set_basedir(dirs.paths[j]))
-                               goto out;
+                       if ( ! set_basedir(conf.manpath.paths[j], argc > 0))
+                               continue;
                        if (0 == treescan())
                        if (0 == treescan())
-                               goto out;
-                       if (0 == set_basedir(dirs.paths[j]))
-                               goto out;
-                       if (0 == dbopen(0))
-                               goto out;
-
-                       mpages_merge(mc, mp);
-                       if (warnings &&
-                           ! (MPARSE_QUICK & mparse_options))
-                               names_check();
-                       dbclose(0);
+                               continue;
+                       dba = dba_new(128);
+                       mpages_merge(dba, mp);
+                       if (nodb == 0)
+                               dbwrite(dba);
+                       dba_free(dba);
 
 
-                       if (j + 1 < dirs.sz) {
+                       if (j + 1 < conf.manpath.sz) {
                                mpages_free();
                                ohash_delete(&mpages);
                                ohash_delete(&mlinks);
                                mpages_free();
                                ohash_delete(&mpages);
                                ohash_delete(&mlinks);
@@ -525,24 +527,37 @@ main(int argc, char *argv[])
                }
        }
 out:
                }
        }
 out:
-       set_basedir(NULL);
-       manpath_free(&dirs);
-       mchars_free(mc);
+       manconf_free(&conf);
        mparse_free(mp);
        mparse_free(mp);
+       mchars_free();
        mpages_free();
        ohash_delete(&mpages);
        ohash_delete(&mlinks);
        mpages_free();
        ohash_delete(&mpages);
        ohash_delete(&mlinks);
-       return(exitcode);
+       return exitcode;
 usage:
 usage:
+       progname = getprogname();
        fprintf(stderr, "usage: %s [-aDnpQ] [-C file] [-Tutf8]\n"
                        "       %s [-aDnpQ] [-Tutf8] dir ...\n"
                        "       %s [-DnpQ] [-Tutf8] -d dir [file ...]\n"
                        "       %s [-Dnp] -u dir [file ...]\n"
                        "       %s [-Q] -t file ...\n",
        fprintf(stderr, "usage: %s [-aDnpQ] [-C file] [-Tutf8]\n"
                        "       %s [-aDnpQ] [-Tutf8] dir ...\n"
                        "       %s [-DnpQ] [-Tutf8] -d dir [file ...]\n"
                        "       %s [-Dnp] -u dir [file ...]\n"
                        "       %s [-Q] -t file ...\n",
-                      progname, progname, progname,
-                      progname, progname);
+                       progname, progname, progname, progname, progname);
+
+       return (int)MANDOCLEVEL_BADARG;
+}
 
 
-       return((int)MANDOCLEVEL_BADARG);
+/*
+ * To get a singly linked list in alpha order while inserting entries
+ * at the beginning, process directory entries in reverse alpha order.
+ */
+static int
+#if HAVE_FTS_COMPARE_CONST
+fts_compare(const FTSENT *const *a, const FTSENT *const *b)
+#else
+fts_compare(const FTSENT **a, const FTSENT **b)
+#endif
+{
+       return -strcmp((*a)->fts_name, (*b)->fts_name);
 }
 
 /*
 }
 
 /*
@@ -557,7 +572,7 @@ usage:
  *   or
  *   [./]cat<section>[/<arch>]/<name>.0
  *
  *   or
  *   [./]cat<section>[/<arch>]/<name>.0
  *
- * TODO: accomodate for multi-language directories.
+ * TODO: accommodate for multi-language directories.
  */
 static int
 treescan(void)
  */
 static int
 treescan(void)
@@ -566,7 +581,8 @@ treescan(void)
        FTS             *f;
        FTSENT          *ff;
        struct mlink    *mlink;
        FTS             *f;
        FTSENT          *ff;
        struct mlink    *mlink;
-       int              dform, gzip;
+       int              gzip;
+       enum form        dform;
        char            *dsec, *arch, *fsec, *cp;
        const char      *path;
        const char      *argv[2];
        char            *dsec, *arch, *fsec, *cp;
        const char      *path;
        const char      *argv[2];
@@ -574,18 +590,18 @@ treescan(void)
        argv[0] = ".";
        argv[1] = (char *)NULL;
 
        argv[0] = ".";
        argv[1] = (char *)NULL;
 
-       f = fts_open((char * const *)argv,
-           FTS_PHYSICAL | FTS_NOCHDIR, NULL);
-       if (NULL == f) {
+       f = fts_open((char * const *)argv, FTS_PHYSICAL | FTS_NOCHDIR,
+           fts_compare);
+       if (f == NULL) {
                exitcode = (int)MANDOCLEVEL_SYSERR;
                say("", "&fts_open");
                exitcode = (int)MANDOCLEVEL_SYSERR;
                say("", "&fts_open");
-               return(0);
+               return 0;
        }
 
        dsec = arch = NULL;
        dform = FORM_NONE;
 
        }
 
        dsec = arch = NULL;
        dform = FORM_NONE;
 
-       while (NULL != (ff = fts_read(f))) {
+       while ((ff = fts_read(f)) != NULL) {
                path = ff->fts_path + 2;
                switch (ff->fts_info) {
 
                path = ff->fts_path + 2;
                switch (ff->fts_info) {
 
@@ -594,18 +610,22 @@ treescan(void)
                 * then get handled just like regular files.
                 */
                case FTS_SL:
                 * then get handled just like regular files.
                 */
                case FTS_SL:
-                       if (NULL == realpath(path, buf)) {
+                       if (realpath(path, buf) == NULL) {
                                if (warnings)
                                        say(path, "&realpath");
                                continue;
                        }
                                if (warnings)
                                        say(path, "&realpath");
                                continue;
                        }
-                       if (strstr(buf, basedir) != buf) {
+                       if (strstr(buf, basedir) != buf
+#ifdef HOMEBREWDIR
+                           && strstr(buf, HOMEBREWDIR) != buf
+#endif
+                       ) {
                                if (warnings) say("",
                                    "%s: outside base directory", buf);
                                continue;
                        }
                        /* Use logical inode to avoid mpages dupe. */
                                if (warnings) say("",
                                    "%s: outside base directory", buf);
                                continue;
                        }
                        /* Use logical inode to avoid mpages dupe. */
-                       if (-1 == stat(path, ff->fts_statp)) {
+                       if (stat(path, ff->fts_statp) == -1) {
                                if (warnings)
                                        say(path, "&stat");
                                continue;
                                if (warnings)
                                        say(path, "&stat");
                                continue;
@@ -617,7 +637,7 @@ treescan(void)
                 * stored directory data and handling the filename.
                 */
                case FTS_F:
                 * stored directory data and handling the filename.
                 */
                case FTS_F:
-                       if (0 == strcmp(path, MANDOC_DB))
+                       if ( ! strcmp(path, MANDOC_DB))
                                continue;
                        if ( ! use_all && ff->fts_level < 2) {
                                if (warnings)
                                continue;
                        if ( ! use_all && ff->fts_level < 2) {
                                if (warnings)
@@ -626,36 +646,37 @@ treescan(void)
                        }
                        gzip = 0;
                        fsec = NULL;
                        }
                        gzip = 0;
                        fsec = NULL;
-                       while (NULL == fsec) {
+                       while (fsec == NULL) {
                                fsec = strrchr(ff->fts_name, '.');
                                fsec = strrchr(ff->fts_name, '.');
-                               if (NULL == fsec || strcmp(fsec+1, "gz"))
+                               if (fsec == NULL || strcmp(fsec+1, "gz"))
                                        break;
                                gzip = 1;
                                *fsec = '\0';
                                fsec = NULL;
                        }
                                        break;
                                gzip = 1;
                                *fsec = '\0';
                                fsec = NULL;
                        }
-                       if (NULL == fsec) {
+                       if (fsec == NULL) {
                                if ( ! use_all) {
                                        if (warnings)
                                                say(path,
                                                    "No filename suffix");
                                        continue;
                                }
                                if ( ! use_all) {
                                        if (warnings)
                                                say(path,
                                                    "No filename suffix");
                                        continue;
                                }
-                       } else if (0 == strcmp(++fsec, "html")) {
+                       } else if ( ! strcmp(++fsec, "html")) {
                                if (warnings)
                                        say(path, "Skip html");
                                continue;
                                if (warnings)
                                        say(path, "Skip html");
                                continue;
-                       } else if (0 == strcmp(fsec, "ps")) {
+                       } else if ( ! strcmp(fsec, "ps")) {
                                if (warnings)
                                        say(path, "Skip ps");
                                continue;
                                if (warnings)
                                        say(path, "Skip ps");
                                continue;
-                       } else if (0 == strcmp(fsec, "pdf")) {
+                       } else if ( ! strcmp(fsec, "pdf")) {
                                if (warnings)
                                        say(path, "Skip pdf");
                                continue;
                        } else if ( ! use_all &&
                                if (warnings)
                                        say(path, "Skip pdf");
                                continue;
                        } else if ( ! use_all &&
-                           ((FORM_SRC == dform && strcmp(fsec, dsec)) ||
-                            (FORM_CAT == dform && strcmp(fsec, "0")))) {
+                           ((dform == FORM_SRC &&
+                             strncmp(fsec, dsec, strlen(dsec))) ||
+                            (dform == FORM_CAT && strcmp(fsec, "0")))) {
                                if (warnings)
                                        say(path, "Wrong filename suffix");
                                continue;
                                if (warnings)
                                        say(path, "Wrong filename suffix");
                                continue;
@@ -663,7 +684,13 @@ treescan(void)
                                fsec[-1] = '\0';
 
                        mlink = mandoc_calloc(1, sizeof(struct mlink));
                                fsec[-1] = '\0';
 
                        mlink = mandoc_calloc(1, sizeof(struct mlink));
-                       strlcpy(mlink->file, path, sizeof(mlink->file));
+                       if (strlcpy(mlink->file, path,
+                           sizeof(mlink->file)) >=
+                           sizeof(mlink->file)) {
+                               say(path, "Filename too long");
+                               free(mlink);
+                               continue;
+                       }
                        mlink->dform = dform;
                        mlink->dsec = dsec;
                        mlink->arch = arch;
                        mlink->dform = dform;
                        mlink->dsec = dsec;
                        mlink->arch = arch;
@@ -674,7 +701,6 @@ treescan(void)
                        continue;
 
                case FTS_D:
                        continue;
 
                case FTS_D:
-                       /* FALLTHROUGH */
                case FTS_DP:
                        break;
 
                case FTS_DP:
                        break;
 
@@ -695,13 +721,16 @@ treescan(void)
                         * If we're not in use_all, enforce it.
                         */
                        cp = ff->fts_name;
                         * If we're not in use_all, enforce it.
                         */
                        cp = ff->fts_name;
-                       if (FTS_DP == ff->fts_info)
+                       if (ff->fts_info == FTS_DP) {
+                               dform = FORM_NONE;
+                               dsec = NULL;
                                break;
                                break;
+                       }
 
 
-                       if (0 == strncmp(cp, "man", 3)) {
+                       if ( ! strncmp(cp, "man", 3)) {
                                dform = FORM_SRC;
                                dsec = cp + 3;
                                dform = FORM_SRC;
                                dsec = cp + 3;
-                       } else if (0 == strncmp(cp, "cat", 3)) {
+                       } else if ( ! strncmp(cp, "cat", 3)) {
                                dform = FORM_CAT;
                                dsec = cp + 3;
                        } else {
                                dform = FORM_CAT;
                                dsec = cp + 3;
                        } else {
@@ -709,7 +738,7 @@ treescan(void)
                                dsec = NULL;
                        }
 
                                dsec = NULL;
                        }
 
-                       if (NULL != dsec || use_all)
+                       if (dsec != NULL || use_all)
                                break;
 
                        if (warnings)
                                break;
 
                        if (warnings)
@@ -721,13 +750,13 @@ treescan(void)
                         * Possibly our architecture.
                         * If we're descending, keep tabs on it.
                         */
                         * Possibly our architecture.
                         * If we're descending, keep tabs on it.
                         */
-                       if (FTS_DP != ff->fts_info && NULL != dsec)
+                       if (ff->fts_info != FTS_DP && dsec != NULL)
                                arch = ff->fts_name;
                        else
                                arch = NULL;
                        break;
                default:
                                arch = ff->fts_name;
                        else
                                arch = NULL;
                        break;
                default:
-                       if (FTS_DP == ff->fts_info || use_all)
+                       if (ff->fts_info == FTS_DP || use_all)
                                break;
                        if (warnings)
                                say(path, "Extraneous directory part");
                                break;
                        if (warnings)
                                say(path, "Extraneous directory part");
@@ -737,7 +766,7 @@ treescan(void)
        }
 
        fts_close(f);
        }
 
        fts_close(f);
-       return(1);
+       return 1;
 }
 
 /*
 }
 
 /*
@@ -794,10 +823,14 @@ filescan(const char *file)
                return;
        }
 
                return;
        }
 
-       if (strstr(buf, basedir) == buf)
-               start = buf + strlen(basedir) + 1;
-       else if (OP_TEST == op)
+       if (OP_TEST == op)
+               start = buf;
+       else if (strstr(buf, basedir) == buf)
+               start = buf + strlen(basedir);
+#ifdef HOMEBREWDIR
+       else if (strstr(buf, HOMEBREWDIR) == buf)
                start = buf;
                start = buf;
+#endif
        else {
                exitcode = (int)MANDOCLEVEL_BADARG;
                say("", "%s: outside base directory", buf);
        else {
                exitcode = (int)MANDOCLEVEL_BADARG;
                say("", "%s: outside base directory", buf);
@@ -819,13 +852,23 @@ filescan(const char *file)
                        say(file, "&stat");
                        return;
                }
                        say(file, "&stat");
                        return;
                }
-               strlcpy(buf, file, sizeof(buf));
-               start = strstr(buf, basedir) == buf ?
-                   buf + strlen(basedir) + 1 : buf;
+               if (strlcpy(buf, file, sizeof(buf)) >= sizeof(buf)) {
+                       say(file, "Filename too long");
+                       return;
+               }
+               start = buf;
+               if (OP_TEST != op && strstr(buf, basedir) == buf)
+                       start += strlen(basedir);
        }
 
        mlink = mandoc_calloc(1, sizeof(struct mlink));
        }
 
        mlink = mandoc_calloc(1, sizeof(struct mlink));
-       strlcpy(mlink->file, start, sizeof(mlink->file));
+       mlink->dform = FORM_NONE;
+       if (strlcpy(mlink->file, start, sizeof(mlink->file)) >=
+           sizeof(mlink->file)) {
+               say(start, "Filename too long");
+               free(mlink);
+               return;
+       }
 
        /*
         * First try to guess our directory structure.
 
        /*
         * First try to guess our directory structure.
@@ -903,6 +946,7 @@ mlink_add(struct mlink *mlink, const struct stat *st)
        assert(NULL == ohash_find(&mlinks, slot));
        ohash_insert(&mlinks, slot, mlink);
 
        assert(NULL == ohash_find(&mlinks, slot));
        ohash_insert(&mlinks, slot, mlink);
 
+       memset(&inodev, 0, sizeof(inodev));  /* Clear padding. */
        inodev.st_ino = st->st_ino;
        inodev.st_dev = st->st_dev;
        slot = ohash_lookup_memory(&mpages, (char *)&inodev,
        inodev.st_ino = st->st_ino;
        inodev.st_dev = st->st_dev;
        slot = ohash_lookup_memory(&mpages, (char *)&inodev,
@@ -912,6 +956,9 @@ mlink_add(struct mlink *mlink, const struct stat *st)
                mpage = mandoc_calloc(1, sizeof(struct mpage));
                mpage->inodev.st_ino = inodev.st_ino;
                mpage->inodev.st_dev = inodev.st_dev;
                mpage = mandoc_calloc(1, sizeof(struct mpage));
                mpage->inodev.st_ino = inodev.st_ino;
                mpage->inodev.st_dev = inodev.st_dev;
+               mpage->form = FORM_NONE;
+               mpage->next = mpage_head;
+               mpage_head = mpage;
                ohash_insert(&mpages, slot, mpage);
        } else
                mlink->next = mpage->mlinks;
                ohash_insert(&mpages, slot, mpage);
        } else
                mlink->next = mpage->mlinks;
@@ -935,20 +982,18 @@ mpages_free(void)
 {
        struct mpage    *mpage;
        struct mlink    *mlink;
 {
        struct mpage    *mpage;
        struct mlink    *mlink;
-       unsigned int     slot;
 
 
-       mpage = ohash_first(&mpages, &slot);
-       while (NULL != mpage) {
-               while (NULL != (mlink = mpage->mlinks)) {
+       while ((mpage = mpage_head) != NULL) {
+               while ((mlink = mpage->mlinks) != NULL) {
                        mpage->mlinks = mlink->next;
                        mlink_free(mlink);
                }
                        mpage->mlinks = mlink->next;
                        mlink_free(mlink);
                }
+               mpage_head = mpage->next;
                free(mpage->sec);
                free(mpage->arch);
                free(mpage->title);
                free(mpage->desc);
                free(mpage);
                free(mpage->sec);
                free(mpage->arch);
                free(mpage->title);
                free(mpage->desc);
                free(mpage);
-               mpage = ohash_next(&mpages, &slot);
        }
 }
 
        }
 }
 
@@ -973,17 +1018,13 @@ mlinks_undupe(struct mpage *mpage)
                        mpage->form = FORM_NONE;
                        goto nextlink;
                }
                        mpage->form = FORM_NONE;
                        goto nextlink;
                }
-               if (strlcpy(buf, mlink->file, PATH_MAX) >= PATH_MAX) {
-                       if (warnings)
-                               say(mlink->file, "Filename too long");
-                       goto nextlink;
-               }
+               (void)strlcpy(buf, mlink->file, sizeof(buf));
                bufp = strstr(buf, "cat");
                assert(NULL != bufp);
                memcpy(bufp, "man", 3);
                if (NULL != (bufp = strrchr(buf, '.')))
                        *++bufp = '\0';
                bufp = strstr(buf, "cat");
                assert(NULL != bufp);
                memcpy(bufp, "man", 3);
                if (NULL != (bufp = strrchr(buf, '.')))
                        *++bufp = '\0';
-               strlcat(buf, mlink->dsec, PATH_MAX);
+               (void)strlcat(buf, mlink->dsec, sizeof(buf));
                if (NULL == ohash_find(&mlinks,
                    ohash_qlookup(&mlinks, buf)))
                        goto nextlink;
                if (NULL == ohash_find(&mlinks,
                    ohash_qlookup(&mlinks, buf)))
                        goto nextlink;
@@ -1029,7 +1070,7 @@ mlink_check(struct mpage *mpage, struct mlink *mlink)
         * architectures.
         * A few manuals are even shared across completely
         * different architectures, for example fdformat(1)
         * architectures.
         * A few manuals are even shared across completely
         * different architectures, for example fdformat(1)
-        * on amd64, i386, sparc, and sparc64.
+        * on amd64, i386, and sparc64.
         */
 
        if (strcasecmp(mpage->arch, mlink->arch))
         */
 
        if (strcasecmp(mpage->arch, mlink->arch))
@@ -1064,101 +1105,56 @@ mlink_check(struct mpage *mpage, struct mlink *mlink)
  * and filename to determine whether the file is parsable or not.
  */
 static void
  * and filename to determine whether the file is parsable or not.
  */
 static void
-mpages_merge(struct mchars *mc, struct mparse *mp)
+mpages_merge(struct dba *dba, struct mparse *mp)
 {
 {
-       char                     any[] = "any";
-       struct ohash_info        str_info;
-       int                      fd[2];
        struct mpage            *mpage, *mpage_dest;
        struct mlink            *mlink, *mlink_dest;
        struct mpage            *mpage, *mpage_dest;
        struct mlink            *mlink, *mlink_dest;
-       struct mdoc             *mdoc;
-       struct man              *man;
+       struct roff_man         *man;
        char                    *sodest;
        char                    *cp;
        char                    *sodest;
        char                    *cp;
-       pid_t                    child_pid;
-       int                      status;
-       unsigned int             pslot;
-       enum mandoclevel         lvl;
-
-       str_info.alloc = hash_alloc;
-       str_info.halloc = hash_halloc;
-       str_info.hfree = hash_free;
-       str_info.key_offset = offsetof(struct str, key);
-
-       if (0 == nodb)
-               SQL_EXEC("BEGIN TRANSACTION");
+       int                      fd;
 
 
-       mpage = ohash_first(&mpages, &pslot);
-       while (NULL != mpage) {
+       for (mpage = mpage_head; mpage != NULL; mpage = mpage->next) {
                mlinks_undupe(mpage);
                mlinks_undupe(mpage);
-               if (NULL == mpage->mlinks) {
-                       mpage = ohash_next(&mpages, &pslot);
+               if ((mlink = mpage->mlinks) == NULL)
                        continue;
                        continue;
-               }
 
                name_mask = NAME_MASK;
 
                name_mask = NAME_MASK;
-               ohash_init(&names, 4, &str_info);
-               ohash_init(&strings, 6, &str_info);
+               mandoc_ohash_init(&names, 4, offsetof(struct str, key));
+               mandoc_ohash_init(&strings, 6, offsetof(struct str, key));
                mparse_reset(mp);
                mparse_reset(mp);
-               mdoc = NULL;
                man = NULL;
                sodest = NULL;
                man = NULL;
                sodest = NULL;
-               child_pid = 0;
-               fd[0] = -1;
-               fd[1] = -1;
-
-               if (mpage->mlinks->gzip) {
-                       if (-1 == pipe(fd)) {
-                               exitcode = (int)MANDOCLEVEL_SYSERR;
-                               say(mpage->mlinks->file, "&pipe gunzip");
-                               goto nextpage;
-                       }
-                       switch (child_pid = fork()) {
-                       case -1:
-                               exitcode = (int)MANDOCLEVEL_SYSERR;
-                               say(mpage->mlinks->file, "&fork gunzip");
-                               child_pid = 0;
-                               close(fd[1]);
-                               close(fd[0]);
-                               goto nextpage;
-                       case 0:
-                               close(fd[0]);
-                               if (-1 == dup2(fd[1], STDOUT_FILENO)) {
-                                       say(mpage->mlinks->file,
-                                           "&dup gunzip");
-                                       exit(1);
-                               }
-                               execlp("gunzip", "gunzip", "-c",
-                                   mpage->mlinks->file, NULL);
-                               say(mpage->mlinks->file, "&exec gunzip");
-                               exit(1);
-                       default:
-                               close(fd[1]);
-                               break;
-                       }
+
+               if ((fd = mparse_open(mp, mlink->file)) == -1) {
+                       say(mlink->file, "&open");
+                       goto nextpage;
                }
 
                /*
                }
 
                /*
-                * Try interpreting the file as mdoc(7) or man(7)
-                * source code, unless it is already known to be
-                * formatted.  Fall back to formatted mode.
+                * Interpret the file as mdoc(7) or man(7) source
+                * code, unless it is known to be formatted.
                 */
                 */
-               if (FORM_CAT != mpage->mlinks->dform ||
-                   FORM_CAT != mpage->mlinks->fform) {
-                       lvl = mparse_readfd(mp, fd[0], mpage->mlinks->file);
-                       if (lvl < MANDOCLEVEL_FATAL)
-                               mparse_result(mp, &mdoc, &man, &sodest);
+               if (mlink->dform != FORM_CAT || mlink->fform != FORM_CAT) {
+                       mparse_readfd(mp, fd, mlink->file);
+                       close(fd);
+                       mparse_result(mp, &man, &sodest);
                }
 
                }
 
-               if (NULL != sodest) {
+               if (sodest != NULL) {
                        mlink_dest = ohash_find(&mlinks,
                            ohash_qlookup(&mlinks, sodest));
                        mlink_dest = ohash_find(&mlinks,
                            ohash_qlookup(&mlinks, sodest));
-                       if (NULL != mlink_dest) {
+                       if (mlink_dest == NULL) {
+                               mandoc_asprintf(&cp, "%s.gz", sodest);
+                               mlink_dest = ohash_find(&mlinks,
+                                   ohash_qlookup(&mlinks, cp));
+                               free(cp);
+                       }
+                       if (mlink_dest != NULL) {
 
                                /* The .so target exists. */
 
                                mpage_dest = mlink_dest->mpage;
 
                                /* The .so target exists. */
 
                                mpage_dest = mlink_dest->mpage;
-                               mlink = mpage->mlinks;
                                while (1) {
                                        mlink->mpage = mpage_dest;
 
                                while (1) {
                                        mlink->mpage = mpage_dest;
 
@@ -1171,10 +1167,10 @@ mpages_merge(struct mchars *mc, struct mparse *mp)
                                         * to the target.
                                         */
 
                                         * to the target.
                                         */
 
-                                       if (mpage_dest->pageid)
+                                       if (mpage_dest->dba != NULL)
                                                dbadd_mlink(mlink);
 
                                                dbadd_mlink(mlink);
 
-                                       if (NULL == mlink->next)
+                                       if (mlink->next == NULL)
                                                break;
                                        mlink = mlink->next;
                                }
                                                break;
                                        mlink = mlink->next;
                                }
@@ -1186,56 +1182,37 @@ mpages_merge(struct mchars *mc, struct mparse *mp)
                                mpage->mlinks = NULL;
                        }
                        goto nextpage;
                                mpage->mlinks = NULL;
                        }
                        goto nextpage;
-               } else if (NULL != mdoc) {
+               } else if (man != NULL && man->macroset == MACROSET_MDOC) {
+                       mdoc_validate(man);
                        mpage->form = FORM_SRC;
                        mpage->form = FORM_SRC;
-                       mpage->sec =
-                           mandoc_strdup(mdoc_meta(mdoc)->msec);
-                       mpage->arch = mdoc_meta(mdoc)->arch;
+                       mpage->sec = man->meta.msec;
+                       mpage->sec = mandoc_strdup(
+                           mpage->sec == NULL ? "" : mpage->sec);
+                       mpage->arch = man->meta.arch;
                        mpage->arch = mandoc_strdup(
                        mpage->arch = mandoc_strdup(
-                           NULL == mpage->arch ? "" : mpage->arch);
-                       mpage->title =
-                           mandoc_strdup(mdoc_meta(mdoc)->title);
-               } else if (NULL != man) {
+                           mpage->arch == NULL ? "" : mpage->arch);
+                       mpage->title = mandoc_strdup(man->meta.title);
+               } else if (man != NULL && man->macroset == MACROSET_MAN) {
+                       man_validate(man);
                        mpage->form = FORM_SRC;
                        mpage->form = FORM_SRC;
-                       mpage->sec =
-                           mandoc_strdup(man_meta(man)->msec);
-                       mpage->arch =
-                           mandoc_strdup(mpage->mlinks->arch);
-                       mpage->title =
-                           mandoc_strdup(man_meta(man)->title);
+                       mpage->sec = mandoc_strdup(man->meta.msec);
+                       mpage->arch = mandoc_strdup(mlink->arch);
+                       mpage->title = mandoc_strdup(man->meta.title);
                } else {
                        mpage->form = FORM_CAT;
                } else {
                        mpage->form = FORM_CAT;
-                       mpage->sec =
-                           mandoc_strdup(mpage->mlinks->dsec);
-                       mpage->arch =
-                           mandoc_strdup(mpage->mlinks->arch);
-                       mpage->title =
-                           mandoc_strdup(mpage->mlinks->name);
-               }
-               putkey(mpage, mpage->sec, TYPE_sec);
-               putkey(mpage, '\0' == *mpage->arch ?
-                   any : mpage->arch, TYPE_arch);
-
-               for (mlink = mpage->mlinks; mlink; mlink = mlink->next) {
-                       if ('\0' != *mlink->dsec)
-                               putkey(mpage, mlink->dsec, TYPE_sec);
-                       if ('\0' != *mlink->fsec)
-                               putkey(mpage, mlink->fsec, TYPE_sec);
-                       putkey(mpage, '\0' == *mlink->arch ?
-                           any : mlink->arch, TYPE_arch);
-                       putkey(mpage, mlink->name, NAME_FILE);
+                       mpage->sec = mandoc_strdup(mlink->dsec);
+                       mpage->arch = mandoc_strdup(mlink->arch);
+                       mpage->title = mandoc_strdup(mlink->name);
                }
 
                }
 
-               assert(NULL == mpage->desc);
-               if (NULL != mdoc) {
-                       if (NULL != (cp = mdoc_meta(mdoc)->name))
-                               putkey(mpage, cp, NAME_HEAD);
-                       parse_mdoc(mpage, mdoc_node(mdoc));
-               } else if (NULL != man)
-                       parse_man(mpage, man_node(man));
+               assert(mpage->desc == NULL);
+               if (man != NULL && man->macroset == MACROSET_MDOC)
+                       parse_mdoc(mpage, &man->meta, man->first);
+               else if (man != NULL)
+                       parse_man(mpage, &man->meta, man->first);
                else
                else
-                       parse_cat(mpage, fd[0]);
-               if (NULL == mpage->desc)
+                       parse_cat(mpage, fd);
+               if (mpage->desc == NULL)
                        mpage->desc = mandoc_strdup(mpage->mlinks->name);
 
                if (warnings && !use_all)
                        mpage->desc = mandoc_strdup(mpage->mlinks->name);
 
                if (warnings && !use_all)
@@ -1243,67 +1220,13 @@ mpages_merge(struct mchars *mc, struct mparse *mp)
                             mlink = mlink->next)
                                mlink_check(mpage, mlink);
 
                             mlink = mlink->next)
                                mlink_check(mpage, mlink);
 
-               dbadd(mpage, mc);
+               dbadd(dba, mpage);
+               mlink = mpage->mlinks;
 
 nextpage:
 
 nextpage:
-               if (child_pid) {
-                       if (-1 == waitpid(child_pid, &status, 0)) {
-                               exitcode = (int)MANDOCLEVEL_SYSERR;
-                               say(mpage->mlinks->file, "&wait gunzip");
-                       } else if (WIFSIGNALED(status)) {
-                               exitcode = (int)MANDOCLEVEL_SYSERR;
-                               say(mpage->mlinks->file,
-                                   "gunzip died from signal %d",
-                                   WTERMSIG(status));
-                       } else if (WEXITSTATUS(status)) {
-                               exitcode = (int)MANDOCLEVEL_SYSERR;
-                               say(mpage->mlinks->file,
-                                   "gunzip failed with code %d",
-                                   WEXITSTATUS(status));
-                       }
-               }
                ohash_delete(&strings);
                ohash_delete(&names);
                ohash_delete(&strings);
                ohash_delete(&names);
-               mpage = ohash_next(&mpages, &pslot);
        }
        }
-
-       if (0 == nodb)
-               SQL_EXEC("END TRANSACTION");
-}
-
-static void
-names_check(void)
-{
-       sqlite3_stmt    *stmt;
-       const char      *name, *sec, *arch, *key;
-       int              irc;
-
-       sqlite3_prepare_v2(db,
-         "SELECT name, sec, arch, key FROM ("
-           "SELECT name AS key, pageid FROM names "
-           "WHERE bits & ? AND NOT EXISTS ("
-             "SELECT pageid FROM mlinks "
-             "WHERE mlinks.pageid == names.pageid "
-             "AND mlinks.name == names.name"
-           ")"
-         ") JOIN ("
-           "SELECT * FROM mlinks GROUP BY pageid"
-         ") USING (pageid);",
-         -1, &stmt, NULL);
-
-       if (SQLITE_OK != sqlite3_bind_int64(stmt, 1, NAME_TITLE))
-               say("", "%s", sqlite3_errmsg(db));
-
-       while (SQLITE_ROW == (irc = sqlite3_step(stmt))) {
-               name = sqlite3_column_text(stmt, 0);
-               sec  = sqlite3_column_text(stmt, 1);
-               arch = sqlite3_column_text(stmt, 2);
-               key  = sqlite3_column_text(stmt, 3);
-               say("", "%s(%s%s%s) lacks mlink \"%s\"", name, sec,
-                   '\0' == *arch ? "" : "/",
-                   '\0' == *arch ? "" : arch, key);
-       }
-       sqlite3_finalize(stmt);
 }
 
 static void
 }
 
 static void
@@ -1311,21 +1234,28 @@ parse_cat(struct mpage *mpage, int fd)
 {
        FILE            *stream;
        char            *line, *p, *title;
 {
        FILE            *stream;
        char            *line, *p, *title;
-       size_t           len, plen, titlesz;
+       size_t           linesz, plen, titlesz;
+       ssize_t          len;
+       int              offs;
 
        stream = (-1 == fd) ?
            fopen(mpage->mlinks->file, "r") :
            fdopen(fd, "r");
        if (NULL == stream) {
 
        stream = (-1 == fd) ?
            fopen(mpage->mlinks->file, "r") :
            fdopen(fd, "r");
        if (NULL == stream) {
+               if (-1 != fd)
+                       close(fd);
                if (warnings)
                        say(mpage->mlinks->file, "&fopen");
                return;
        }
 
                if (warnings)
                        say(mpage->mlinks->file, "&fopen");
                return;
        }
 
+       line = NULL;
+       linesz = 0;
+
        /* Skip to first blank line. */
 
        /* Skip to first blank line. */
 
-       while (NULL != (line = fgetln(stream, &len)))
-               if ('\n' == *line)
+       while (getline(&line, &linesz, stream) != -1)
+               if (*line == '\n')
                        break;
 
        /*
                        break;
 
        /*
@@ -1333,8 +1263,8 @@ parse_cat(struct mpage *mpage, int fd)
         * is the first section header.  Skip to it.
         */
 
         * is the first section header.  Skip to it.
         */
 
-       while (NULL != (line = fgetln(stream, &len)))
-               if ('\n' != *line && ' ' != *line)
+       while (getline(&line, &linesz, stream) != -1)
+               if (*line != '\n' && *line != ' ')
                        break;
 
        /*
                        break;
 
        /*
@@ -1347,20 +1277,20 @@ parse_cat(struct mpage *mpage, int fd)
        titlesz = 0;
        title = NULL;
 
        titlesz = 0;
        title = NULL;
 
-       while (NULL != (line = fgetln(stream, &len))) {
-               if (' ' != *line || '\n' != line[len - 1])
+       while ((len = getline(&line, &linesz, stream)) != -1) {
+               if (*line != ' ')
                        break;
                        break;
-               while (len > 0 && isspace((unsigned char)*line)) {
-                       line++;
-                       len--;
-               }
-               if (1 == len)
+               offs = 0;
+               while (isspace((unsigned char)line[offs]))
+                       offs++;
+               if (line[offs] == '\0')
                        continue;
                        continue;
-               title = mandoc_realloc(title, titlesz + len);
-               memcpy(title + titlesz, line, len);
-               titlesz += len;
+               title = mandoc_realloc(title, titlesz + len - offs);
+               memcpy(title + titlesz, line + offs, len - offs);
+               titlesz += len - offs;
                title[titlesz - 1] = ' ';
        }
                title[titlesz - 1] = ' ';
        }
+       free(line);
 
        /*
         * If no page content can be found, or the input line
 
        /*
         * If no page content can be found, or the input line
@@ -1378,8 +1308,7 @@ parse_cat(struct mpage *mpage, int fd)
                return;
        }
 
                return;
        }
 
-       title = mandoc_realloc(title, titlesz + 1);
-       title[titlesz] = '\0';
+       title[titlesz - 1] = '\0';
 
        /*
         * Skip to the first dash.
 
        /*
         * Skip to the first dash.
@@ -1422,13 +1351,6 @@ parse_cat(struct mpage *mpage, int fd)
 static void
 putkey(const struct mpage *mpage, char *value, uint64_t type)
 {
 static void
 putkey(const struct mpage *mpage, char *value, uint64_t type)
 {
-       char     *cp;
-
-       assert(NULL != value);
-       if (TYPE_arch == type)
-               for (cp = value; *cp; cp++)
-                       if (isupper((unsigned char)*cp))
-                               *cp = _tolower((unsigned char)*cp);
        putkeys(mpage, value, strlen(value), type);
 }
 
        putkeys(mpage, value, strlen(value), type);
 }
 
@@ -1437,26 +1359,27 @@ putkey(const struct mpage *mpage, char *value, uint64_t type)
  */
 static void
 putmdockey(const struct mpage *mpage,
  */
 static void
 putmdockey(const struct mpage *mpage,
-       const struct mdoc_node *n, uint64_t m)
+       const struct roff_node *n, uint64_t m)
 {
 
        for ( ; NULL != n; n = n->next) {
                if (NULL != n->child)
                        putmdockey(mpage, n->child, m);
 {
 
        for ( ; NULL != n; n = n->next) {
                if (NULL != n->child)
                        putmdockey(mpage, n->child, m);
-               if (MDOC_TEXT == n->type)
+               if (n->type == ROFFT_TEXT)
                        putkey(mpage, n->string, m);
        }
 }
 
 static void
                        putkey(mpage, n->string, m);
        }
 }
 
 static void
-parse_man(struct mpage *mpage, const struct man_node *n)
+parse_man(struct mpage *mpage, const struct roff_meta *meta,
+       const struct roff_node *n)
 {
 {
-       const struct man_node *head, *body;
+       const struct roff_node *head, *body;
        char            *start, *title;
        char             byte;
        size_t           sz;
 
        char            *start, *title;
        char             byte;
        size_t           sz;
 
-       if (NULL == n)
+       if (n == NULL)
                return;
 
        /*
                return;
 
        /*
@@ -1466,15 +1389,14 @@ parse_man(struct mpage *mpage, const struct man_node *n)
         * the correct section or not.
         */
 
         * the correct section or not.
         */
 
-       if (MAN_BODY == n->type && MAN_SH == n->tok) {
+       if (n->type == ROFFT_BODY && n->tok == MAN_SH) {
                body = n;
                body = n;
-               assert(body->parent);
-               if (NULL != (head = body->parent->head) &&
-                   1 == head->nchild &&
-                   NULL != (head = (head->child)) &&
-                   MAN_TEXT == head->type &&
-                   0 == strcmp(head->string, "NAME") &&
-                   NULL != body->child) {
+               if ((head = body->parent->head) != NULL &&
+                   (head = head->child) != NULL &&
+                   head->next == NULL &&
+                   head->type == ROFFT_TEXT &&
+                   strcmp(head->string, "NAME") == 0 &&
+                   body->child != NULL) {
 
                        /*
                         * Suck the entire NAME section into memory.
 
                        /*
                         * Suck the entire NAME section into memory.
@@ -1484,7 +1406,7 @@ parse_man(struct mpage *mpage, const struct man_node *n)
                         */
 
                        title = NULL;
                         */
 
                        title = NULL;
-                       man_deroff(&title, body);
+                       deroff(&title, body);
                        if (NULL == title)
                                return;
 
                        if (NULL == title)
                                return;
 
@@ -1515,6 +1437,11 @@ parse_man(struct mpage *mpage, const struct man_node *n)
                                        break;
 
                                putkey(mpage, start, NAME_TITLE);
                                        break;
 
                                putkey(mpage, start, NAME_TITLE);
+                               if ( ! (mpage->name_head_done ||
+                                   strcasecmp(start, meta->title))) {
+                                       putkey(mpage, start, NAME_HEAD);
+                                       mpage->name_head_done = 1;
+                               }
 
                                if (' ' == byte) {
                                        start += sz + 1;
 
                                if (' ' == byte) {
                                        start += sz + 1;
@@ -1529,6 +1456,11 @@ parse_man(struct mpage *mpage, const struct man_node *n)
 
                        if (start == title) {
                                putkey(mpage, start, NAME_TITLE);
 
                        if (start == title) {
                                putkey(mpage, start, NAME_TITLE);
+                               if ( ! (mpage->name_head_done ||
+                                   strcasecmp(start, meta->title))) {
+                                       putkey(mpage, start, NAME_HEAD);
+                                       mpage->name_head_done = 1;
+                               }
                                free(title);
                                return;
                        }
                                free(title);
                                return;
                        }
@@ -1559,52 +1491,50 @@ parse_man(struct mpage *mpage, const struct man_node *n)
        for (n = n->child; n; n = n->next) {
                if (NULL != mpage->desc)
                        break;
        for (n = n->child; n; n = n->next) {
                if (NULL != mpage->desc)
                        break;
-               parse_man(mpage, n);
+               parse_man(mpage, meta, n);
        }
 }
 
 static void
        }
 }
 
 static void
-parse_mdoc(struct mpage *mpage, const struct mdoc_node *n)
+parse_mdoc(struct mpage *mpage, const struct roff_meta *meta,
+       const struct roff_node *n)
 {
 
        assert(NULL != n);
        for (n = n->child; NULL != n; n = n->next) {
                switch (n->type) {
 {
 
        assert(NULL != n);
        for (n = n->child; NULL != n; n = n->next) {
                switch (n->type) {
-               case MDOC_ELEM:
-                       /* FALLTHROUGH */
-               case MDOC_BLOCK:
-                       /* FALLTHROUGH */
-               case MDOC_HEAD:
-                       /* FALLTHROUGH */
-               case MDOC_BODY:
-                       /* FALLTHROUGH */
-               case MDOC_TAIL:
+               case ROFFT_ELEM:
+               case ROFFT_BLOCK:
+               case ROFFT_HEAD:
+               case ROFFT_BODY:
+               case ROFFT_TAIL:
                        if (NULL != mdocs[n->tok].fp)
                        if (NULL != mdocs[n->tok].fp)
-                              if (0 == (*mdocs[n->tok].fp)(mpage, n))
+                              if (0 == (*mdocs[n->tok].fp)(mpage, meta, n))
                                       break;
                        if (mdocs[n->tok].mask)
                                putmdockey(mpage, n->child,
                                    mdocs[n->tok].mask);
                        break;
                default:
                                       break;
                        if (mdocs[n->tok].mask)
                                putmdockey(mpage, n->child,
                                    mdocs[n->tok].mask);
                        break;
                default:
-                       assert(MDOC_ROOT != n->type);
+                       assert(n->type != ROFFT_ROOT);
                        continue;
                }
                if (NULL != n->child)
                        continue;
                }
                if (NULL != n->child)
-                       parse_mdoc(mpage, n);
+                       parse_mdoc(mpage, meta, n);
        }
 }
 
 static int
        }
 }
 
 static int
-parse_mdoc_Fd(struct mpage *mpage, const struct mdoc_node *n)
+parse_mdoc_Fd(struct mpage *mpage, const struct roff_meta *meta,
+       const struct roff_node *n)
 {
 {
-       const char      *start, *end;
+       char            *start, *end;
        size_t           sz;
 
        if (SEC_SYNOPSIS != n->sec ||
            NULL == (n = n->child) ||
        size_t           sz;
 
        if (SEC_SYNOPSIS != n->sec ||
            NULL == (n = n->child) ||
-           MDOC_TEXT != n->type)
-               return(0);
+           n->type != ROFFT_TEXT)
+               return 0;
 
        /*
         * Only consider those `Fd' macro fields that begin with an
 
        /*
         * Only consider those `Fd' macro fields that begin with an
@@ -1612,10 +1542,10 @@ parse_mdoc_Fd(struct mpage *mpage, const struct mdoc_node *n)
         */
 
        if (strcmp("#include", n->string))
         */
 
        if (strcmp("#include", n->string))
-               return(0);
+               return 0;
 
 
-       if (NULL == (n = n->next) || MDOC_TEXT != n->type)
-               return(0);
+       if ((n = n->next) == NULL || n->type != ROFFT_TEXT)
+               return 0;
 
        /*
         * Strip away the enclosing angle brackets and make sure we're
 
        /*
         * Strip away the enclosing angle brackets and make sure we're
@@ -1627,7 +1557,7 @@ parse_mdoc_Fd(struct mpage *mpage, const struct mdoc_node *n)
                start++;
 
        if (0 == (sz = strlen(start)))
                start++;
 
        if (0 == (sz = strlen(start)))
-               return(0);
+               return 0;
 
        end = &start[(int)sz - 1];
        if ('>' == *end || '"' == *end)
 
        end = &start[(int)sz - 1];
        if ('>' == *end || '"' == *end)
@@ -1635,100 +1565,152 @@ parse_mdoc_Fd(struct mpage *mpage, const struct mdoc_node *n)
 
        if (end > start)
                putkeys(mpage, start, end - start + 1, TYPE_In);
 
        if (end > start)
                putkeys(mpage, start, end - start + 1, TYPE_In);
-       return(0);
+       return 0;
 }
 
 }
 
-static int
-parse_mdoc_Fn(struct mpage *mpage, const struct mdoc_node *n)
+static void
+parse_mdoc_fname(struct mpage *mpage, const struct roff_node *n)
 {
        char    *cp;
 {
        char    *cp;
+       size_t   sz;
 
 
-       if (NULL == (n = n->child) || MDOC_TEXT != n->type)
-               return(0);
-
-       /*
-        * Parse: .Fn "struct type *name" "char *arg".
-        * First strip away pointer symbol.
-        * Then store the function name, then type.
-        * Finally, store the arguments.
-        */
+       if (n->type != ROFFT_TEXT)
+               return;
 
 
-       if (NULL == (cp = strrchr(n->string, ' ')))
-               cp = n->string;
+       /* Skip function pointer punctuation. */
 
 
-       while ('*' == *cp)
+       cp = n->string;
+       while (*cp == '(' || *cp == '*')
                cp++;
                cp++;
+       sz = strcspn(cp, "()");
+
+       putkeys(mpage, cp, sz, TYPE_Fn);
+       if (n->sec == SEC_SYNOPSIS)
+               putkeys(mpage, cp, sz, NAME_SYN);
+}
+
+static int
+parse_mdoc_Fn(struct mpage *mpage, const struct roff_meta *meta,
+       const struct roff_node *n)
+{
 
 
-       putkey(mpage, cp, TYPE_Fn);
+       if (n->child == NULL)
+               return 0;
 
 
-       if (n->string < cp)
-               putkeys(mpage, n->string, cp - n->string, TYPE_Ft);
+       parse_mdoc_fname(mpage, n->child);
 
 
-       for (n = n->next; NULL != n; n = n->next)
-               if (MDOC_TEXT == n->type)
+       for (n = n->child->next; n != NULL; n = n->next)
+               if (n->type == ROFFT_TEXT)
                        putkey(mpage, n->string, TYPE_Fa);
 
                        putkey(mpage, n->string, TYPE_Fa);
 
-       return(0);
+       return 0;
+}
+
+static int
+parse_mdoc_Fo(struct mpage *mpage, const struct roff_meta *meta,
+       const struct roff_node *n)
+{
+
+       if (n->type != ROFFT_HEAD)
+               return 1;
+
+       if (n->child != NULL)
+               parse_mdoc_fname(mpage, n->child);
+
+       return 0;
+}
+
+static int
+parse_mdoc_Va(struct mpage *mpage, const struct roff_meta *meta,
+       const struct roff_node *n)
+{
+       char *cp;
+
+       if (n->type != ROFFT_ELEM && n->type != ROFFT_BODY)
+               return 0;
+
+       if (n->child != NULL &&
+           n->child->next == NULL &&
+           n->child->type == ROFFT_TEXT)
+               return 1;
+
+       cp = NULL;
+       deroff(&cp, n);
+       if (cp != NULL) {
+               putkey(mpage, cp, TYPE_Vt | (n->tok == MDOC_Va ||
+                   n->type == ROFFT_BODY ? TYPE_Va : 0));
+               free(cp);
+       }
+
+       return 0;
 }
 
 static int
 }
 
 static int
-parse_mdoc_Xr(struct mpage *mpage, const struct mdoc_node *n)
+parse_mdoc_Xr(struct mpage *mpage, const struct roff_meta *meta,
+       const struct roff_node *n)
 {
        char    *cp;
 
        if (NULL == (n = n->child))
 {
        char    *cp;
 
        if (NULL == (n = n->child))
-               return(0);
+               return 0;
 
        if (NULL == n->next) {
                putkey(mpage, n->string, TYPE_Xr);
 
        if (NULL == n->next) {
                putkey(mpage, n->string, TYPE_Xr);
-               return(0);
+               return 0;
        }
 
        mandoc_asprintf(&cp, "%s(%s)", n->string, n->next->string);
        putkey(mpage, cp, TYPE_Xr);
        free(cp);
        }
 
        mandoc_asprintf(&cp, "%s(%s)", n->string, n->next->string);
        putkey(mpage, cp, TYPE_Xr);
        free(cp);
-       return(0);
+       return 0;
 }
 
 static int
 }
 
 static int
-parse_mdoc_Nd(struct mpage *mpage, const struct mdoc_node *n)
+parse_mdoc_Nd(struct mpage *mpage, const struct roff_meta *meta,
+       const struct roff_node *n)
 {
 
 {
 
-       if (MDOC_BODY == n->type)
-               mdoc_deroff(&mpage->desc, n);
-       return(0);
+       if (n->type == ROFFT_BODY)
+               deroff(&mpage->desc, n);
+       return 0;
 }
 
 static int
 }
 
 static int
-parse_mdoc_Nm(struct mpage *mpage, const struct mdoc_node *n)
+parse_mdoc_Nm(struct mpage *mpage, const struct roff_meta *meta,
+       const struct roff_node *n)
 {
 
        if (SEC_NAME == n->sec)
                putmdockey(mpage, n->child, NAME_TITLE);
 {
 
        if (SEC_NAME == n->sec)
                putmdockey(mpage, n->child, NAME_TITLE);
-       else if (SEC_SYNOPSIS == n->sec && MDOC_HEAD == n->type)
-               putmdockey(mpage, n->child, NAME_SYN);
-       return(0);
-}
-
-static int
-parse_mdoc_Sh(struct mpage *mpage, const struct mdoc_node *n)
-{
-
-       return(SEC_CUSTOM == n->sec && MDOC_HEAD == n->type);
+       else if (n->sec == SEC_SYNOPSIS && n->type == ROFFT_HEAD) {
+               if (n->child == NULL)
+                       putkey(mpage, meta->name, NAME_SYN);
+               else
+                       putmdockey(mpage, n->child, NAME_SYN);
+       }
+       if ( ! (mpage->name_head_done ||
+           n->child == NULL || n->child->string == NULL ||
+           strcasecmp(n->child->string, meta->title))) {
+               putkey(mpage, n->child->string, NAME_HEAD);
+               mpage->name_head_done = 1;
+       }
+       return 0;
 }
 
 static int
 }
 
 static int
-parse_mdoc_head(struct mpage *mpage, const struct mdoc_node *n)
+parse_mdoc_Sh(struct mpage *mpage, const struct roff_meta *meta,
+       const struct roff_node *n)
 {
 
 {
 
-       return(MDOC_HEAD == n->type);
+       return n->sec == SEC_CUSTOM && n->type == ROFFT_HEAD;
 }
 
 static int
 }
 
 static int
-parse_mdoc_body(struct mpage *mpage, const struct mdoc_node *n)
+parse_mdoc_head(struct mpage *mpage, const struct roff_meta *meta,
+       const struct roff_node *n)
 {
 
 {
 
-       return(MDOC_BODY == n->type);
+       return n->type == ROFFT_HEAD;
 }
 
 /*
 }
 
 /*
@@ -1737,33 +1719,36 @@ parse_mdoc_body(struct mpage *mpage, const struct mdoc_node *n)
  * When we finish the manual, we'll dump the table.
  */
 static void
  * When we finish the manual, we'll dump the table.
  */
 static void
-putkeys(const struct mpage *mpage,
-       const char *cp, size_t sz, uint64_t v)
+putkeys(const struct mpage *mpage, char *cp, size_t sz, uint64_t v)
 {
        struct ohash    *htab;
        struct str      *s;
        const char      *end;
        unsigned int     slot;
 {
        struct ohash    *htab;
        struct str      *s;
        const char      *end;
        unsigned int     slot;
-       int              i;
+       int              i, mustfree;
 
        if (0 == sz)
                return;
 
 
        if (0 == sz)
                return;
 
+       mustfree = render_string(&cp, &sz);
+
        if (TYPE_Nm & v) {
                htab = &names;
                v &= name_mask;
        if (TYPE_Nm & v) {
                htab = &names;
                v &= name_mask;
-               name_mask &= ~NAME_FIRST;
+               if (v & NAME_FIRST)
+                       name_mask &= ~NAME_FIRST;
                if (debug > 1)
                        say(mpage->mlinks->file,
                if (debug > 1)
                        say(mpage->mlinks->file,
-                           "Adding name %*s", sz, cp);
+                           "Adding name %*s, bits=0x%llx", (int)sz, cp,
+                           (unsigned long long)v);
        } else {
                htab = &strings;
                if (debug > 1)
        } else {
                htab = &strings;
                if (debug > 1)
-                   for (i = 0; i < mansearch_keymax; i++)
-                       if (1 << i & v)
+                   for (i = 0; i < KEY_MAX; i++)
+                       if ((uint64_t)1 << i & v)
                            say(mpage->mlinks->file,
                                "Adding key %s=%*s",
                            say(mpage->mlinks->file,
                                "Adding key %s=%*s",
-                               mansearch_keynames[i], sz, cp);
+                               mansearch_keynames[i], (int)sz, cp);
        }
 
        end = cp + sz;
        }
 
        end = cp + sz;
@@ -1774,12 +1759,15 @@ putkeys(const struct mpage *mpage,
                s->mask |= v;
                return;
        } else if (NULL == s) {
                s->mask |= v;
                return;
        } else if (NULL == s) {
-               s = mandoc_calloc(sizeof(struct str) + sz + 1, 1);
+               s = mandoc_calloc(1, sizeof(struct str) + sz + 1);
                memcpy(s->key, cp, sz);
                ohash_insert(htab, slot, s);
        }
        s->mpage = mpage;
        s->mask = v;
                memcpy(s->key, cp, sz);
                ohash_insert(htab, slot, s);
        }
        s->mpage = mpage;
        s->mask = v;
+
+       if (mustfree)
+               free(cp);
 }
 
 /*
 }
 
 /*
@@ -1828,27 +1816,26 @@ utf8(unsigned int cp, char out[7])
                out[4] = (cp >> 6  & 63) | 128;
                out[5] = (cp       & 63) | 128;
        } else
                out[4] = (cp >> 6  & 63) | 128;
                out[5] = (cp       & 63) | 128;
        } else
-               return(0);
+               return 0;
 
        out[rc] = '\0';
 
        out[rc] = '\0';
-       return(rc);
+       return rc;
 }
 
 /*
 }
 
 /*
- * Store the rendered version of a key, or alias the pointer
- * if the key contains no escape sequences.
+ * If the string contains escape sequences,
+ * replace it with an allocated rendering and return 1,
+ * such that the caller can free it after use.
+ * Otherwise, do nothing and return 0.
  */
  */
-static void
-render_key(struct mchars *mc, struct str *key)
+static int
+render_string(char **public, size_t *psz)
 {
 {
-       size_t           sz, bsz, pos;
+       const char      *src, *scp, *addcp, *seq;
+       char            *dst;
+       size_t           ssz, dsz, addsz;
        char             utfbuf[7], res[6];
        char             utfbuf[7], res[6];
-       char            *buf;
-       const char      *seq, *cpp, *val;
-       int              len, u;
-       enum mandoc_esc  esc;
-
-       assert(NULL == key->rendered);
+       int              seqlen, unicode;
 
        res[0] = '\\';
        res[1] = '\t';
 
        res[0] = '\\';
        res[1] = '\t';
@@ -1857,68 +1844,61 @@ render_key(struct mchars *mc, struct str *key)
        res[4] = ASCII_BREAK;
        res[5] = '\0';
 
        res[4] = ASCII_BREAK;
        res[5] = '\0';
 
-       val = key->key;
-       bsz = strlen(val);
+       src = scp = *public;
+       ssz = *psz;
+       dst = NULL;
+       dsz = 0;
 
 
-       /*
-        * Pre-check: if we have no stop-characters, then set the
-        * pointer as ourselvse and get out of here.
-        */
-       if (strcspn(val, res) == bsz) {
-               key->rendered = key->key;
-               return;
-       }
+       while (scp < src + *psz) {
 
 
-       /* Pre-allocate by the length of the input */
+               /* Leave normal characters unchanged. */
 
 
-       buf = mandoc_malloc(++bsz);
-       pos = 0;
+               if (strchr(res, *scp) == NULL) {
+                       if (dst != NULL)
+                               dst[dsz++] = *scp;
+                       scp++;
+                       continue;
+               }
 
 
-       while ('\0' != *val) {
                /*
                /*
-                * Halt on the first escape sequence.
-                * This also halts on the end of string, in which case
-                * we just copy, fallthrough, and exit the loop.
+                * Found something that requires replacing,
+                * make sure we have a destination buffer.
                 */
                 */
-               if ((sz = strcspn(val, res)) > 0) {
-                       memcpy(&buf[pos], val, sz);
-                       pos += sz;
-                       val += sz;
+
+               if (dst == NULL) {
+                       dst = mandoc_malloc(ssz + 1);
+                       dsz = scp - src;
+                       memcpy(dst, src, dsz);
                }
 
                }
 
-               switch (*val) {
-               case ASCII_HYPH:
-                       buf[pos++] = '-';
-                       val++;
-                       continue;
+               /* Handle single-char special characters. */
+
+               switch (*scp) {
+               case '\\':
+                       break;
                case '\t':
                case '\t':
-                       /* FALLTHROUGH */
                case ASCII_NBRSP:
                case ASCII_NBRSP:
-                       buf[pos++] = ' ';
-                       val++;
+                       dst[dsz++] = ' ';
+                       scp++;
+                       continue;
+               case ASCII_HYPH:
+                       dst[dsz++] = '-';
                        /* FALLTHROUGH */
                case ASCII_BREAK:
                        /* FALLTHROUGH */
                case ASCII_BREAK:
+                       scp++;
                        continue;
                default:
                        continue;
                default:
-                       break;
+                       abort();
                }
                }
-               if ('\\' != *val)
-                       break;
-
-               /* Read past the slash. */
-
-               val++;
 
                /*
 
                /*
-                * Parse the escape sequence and see if it's a
-                * predefined character or special character.
+                * Found an escape sequence.
+                * Read past the slash, then parse it.
+                * Ignore everything except characters.
                 */
 
                 */
 
-               esc = mandoc_escape((const char **)&val,
-                   &seq, &len);
-               if (ESCAPE_ERROR == esc)
-                       break;
-               if (ESCAPE_SPECIAL != esc)
+               scp++;
+               if (mandoc_escape(&scp, &seq, &seqlen) != ESCAPE_SPECIAL)
                        continue;
 
                /*
                        continue;
 
                /*
@@ -1927,65 +1907,82 @@ render_key(struct mchars *mc, struct str *key)
                 */
 
                if (write_utf8) {
                 */
 
                if (write_utf8) {
-                       if (0 == (u = mchars_spec2cp(mc, seq, len)))
+                       unicode = mchars_spec2cp(seq, seqlen);
+                       if (unicode <= 0)
                                continue;
                                continue;
-                       cpp = utfbuf;
-                       if (0 == (sz = utf8(u, utfbuf)))
+                       addsz = utf8(unicode, utfbuf);
+                       if (addsz == 0)
                                continue;
                                continue;
-                       sz = strlen(cpp);
+                       addcp = utfbuf;
                } else {
                } else {
-                       cpp = mchars_spec2str(mc, seq, len, &sz);
-                       if (NULL == cpp)
+                       addcp = mchars_spec2str(seq, seqlen, &addsz);
+                       if (addcp == NULL)
                                continue;
                                continue;
-                       if (ASCII_NBRSP == *cpp) {
-                               cpp = " ";
-                               sz = 1;
+                       if (*addcp == ASCII_NBRSP) {
+                               addcp = " ";
+                               addsz = 1;
                        }
                }
 
                /* Copy the rendered glyph into the stream. */
 
                        }
                }
 
                /* Copy the rendered glyph into the stream. */
 
-               bsz += sz;
-               buf = mandoc_realloc(buf, bsz);
-               memcpy(&buf[pos], cpp, sz);
-               pos += sz;
+               ssz += addsz;
+               dst = mandoc_realloc(dst, ssz + 1);
+               memcpy(dst + dsz, addcp, addsz);
+               dsz += addsz;
+       }
+       if (dst != NULL) {
+               *public = dst;
+               *psz = dsz;
        }
 
        }
 
-       buf[pos] = '\0';
-       key->rendered = buf;
+       /* Trim trailing whitespace and NUL-terminate. */
+
+       while (*psz > 0 && (*public)[*psz - 1] == ' ')
+               --*psz;
+       if (dst != NULL) {
+               (*public)[*psz] = '\0';
+               return 1;
+       } else
+               return 0;
 }
 
 static void
 dbadd_mlink(const struct mlink *mlink)
 {
 }
 
 static void
 dbadd_mlink(const struct mlink *mlink)
 {
-       size_t           i;
-
-       i = 1;
-       SQL_BIND_TEXT(stmts[STMT_INSERT_LINK], i, mlink->dsec);
-       SQL_BIND_TEXT(stmts[STMT_INSERT_LINK], i, mlink->arch);
-       SQL_BIND_TEXT(stmts[STMT_INSERT_LINK], i, mlink->name);
-       SQL_BIND_INT64(stmts[STMT_INSERT_LINK], i, mlink->mpage->pageid);
-       SQL_STEP(stmts[STMT_INSERT_LINK]);
-       sqlite3_reset(stmts[STMT_INSERT_LINK]);
+       dba_page_alias(mlink->mpage->dba, mlink->name, NAME_FILE);
+       dba_page_add(mlink->mpage->dba, DBP_SECT, mlink->dsec);
+       dba_page_add(mlink->mpage->dba, DBP_SECT, mlink->fsec);
+       dba_page_add(mlink->mpage->dba, DBP_ARCH, mlink->arch);
+       dba_page_add(mlink->mpage->dba, DBP_FILE, mlink->file);
 }
 
 /*
  * Flush the current page's terms (and their bits) into the database.
 }
 
 /*
  * Flush the current page's terms (and their bits) into the database.
- * Wrap the entire set of additions in a transaction to make sqlite be a
- * little faster.
  * Also, handle escape sequences at the last possible moment.
  */
 static void
  * Also, handle escape sequences at the last possible moment.
  */
 static void
-dbadd(struct mpage *mpage, struct mchars *mc)
+dbadd(struct dba *dba, struct mpage *mpage)
 {
        struct mlink    *mlink;
        struct str      *key;
 {
        struct mlink    *mlink;
        struct str      *key;
+       char            *cp;
+       uint64_t         mask;
        size_t           i;
        unsigned int     slot;
        size_t           i;
        unsigned int     slot;
+       int              mustfree;
 
        mlink = mpage->mlinks;
 
        if (nodb) {
 
        mlink = mpage->mlinks;
 
        if (nodb) {
+               for (key = ohash_first(&names, &slot); NULL != key;
+                    key = ohash_next(&names, &slot))
+                       free(key);
+               for (key = ohash_first(&strings, &slot); NULL != key;
+                    key = ohash_next(&strings, &slot))
+                       free(key);
+               if (0 == debug)
+                       return;
                while (NULL != mlink) {
                        fputs(mlink->name, stdout);
                        if (NULL == mlink->next ||
                while (NULL != mlink) {
                        fputs(mlink->name, stdout);
                        if (NULL == mlink->next ||
@@ -2012,117 +2009,94 @@ dbadd(struct mpage *mpage, struct mchars *mc)
        if (debug)
                say(mlink->file, "Adding to database");
 
        if (debug)
                say(mlink->file, "Adding to database");
 
-       i = 1;
-       SQL_BIND_TEXT(stmts[STMT_INSERT_PAGE], i, mpage->desc);
-       SQL_BIND_INT(stmts[STMT_INSERT_PAGE], i, FORM_SRC == mpage->form);
-       SQL_STEP(stmts[STMT_INSERT_PAGE]);
-       mpage->pageid = sqlite3_last_insert_rowid(db);
-       sqlite3_reset(stmts[STMT_INSERT_PAGE]);
-
-       while (NULL != mlink) {
+       cp = mpage->desc;
+       i = strlen(cp);
+       mustfree = render_string(&cp, &i);
+       mpage->dba = dba_page_new(dba->pages,
+           *mpage->arch == '\0' ? mlink->arch : mpage->arch,
+           cp, mlink->file, mpage->form);
+       if (mustfree)
+               free(cp);
+       dba_page_add(mpage->dba, DBP_SECT, mpage->sec);
+
+       while (mlink != NULL) {
                dbadd_mlink(mlink);
                mlink = mlink->next;
        }
                dbadd_mlink(mlink);
                mlink = mlink->next;
        }
-       mlink = mpage->mlinks;
 
        for (key = ohash_first(&names, &slot); NULL != key;
             key = ohash_next(&names, &slot)) {
                assert(key->mpage == mpage);
 
        for (key = ohash_first(&names, &slot); NULL != key;
             key = ohash_next(&names, &slot)) {
                assert(key->mpage == mpage);
-               if (NULL == key->rendered)
-                       render_key(mc, key);
-               i = 1;
-               SQL_BIND_INT64(stmts[STMT_INSERT_NAME], i, key->mask);
-               SQL_BIND_TEXT(stmts[STMT_INSERT_NAME], i, key->rendered);
-               SQL_BIND_INT64(stmts[STMT_INSERT_NAME], i, mpage->pageid);
-               SQL_STEP(stmts[STMT_INSERT_NAME]);
-               sqlite3_reset(stmts[STMT_INSERT_NAME]);
-               if (key->rendered != key->key)
-                       free(key->rendered);
+               dba_page_alias(mpage->dba, key->key, key->mask);
                free(key);
        }
        for (key = ohash_first(&strings, &slot); NULL != key;
             key = ohash_next(&strings, &slot)) {
                assert(key->mpage == mpage);
                free(key);
        }
        for (key = ohash_first(&strings, &slot); NULL != key;
             key = ohash_next(&strings, &slot)) {
                assert(key->mpage == mpage);
-               if (NULL == key->rendered)
-                       render_key(mc, key);
-               i = 1;
-               SQL_BIND_INT64(stmts[STMT_INSERT_KEY], i, key->mask);
-               SQL_BIND_TEXT(stmts[STMT_INSERT_KEY], i, key->rendered);
-               SQL_BIND_INT64(stmts[STMT_INSERT_KEY], i, mpage->pageid);
-               SQL_STEP(stmts[STMT_INSERT_KEY]);
-               sqlite3_reset(stmts[STMT_INSERT_KEY]);
-               if (key->rendered != key->key)
-                       free(key->rendered);
+               i = 0;
+               for (mask = TYPE_Xr; mask <= TYPE_Lb; mask *= 2) {
+                       if (key->mask & mask)
+                               dba_macro_add(dba->macros, i,
+                                   key->key, mpage->dba);
+                       i++;
+               }
                free(key);
        }
 }
 
 static void
                free(key);
        }
 }
 
 static void
-dbprune(void)
+dbprune(struct dba *dba)
 {
 {
-       struct mpage    *mpage;
-       struct mlink    *mlink;
-       size_t           i;
-       unsigned int     slot;
-
-       if (0 == nodb)
-               SQL_EXEC("BEGIN TRANSACTION");
-
-       for (mpage = ohash_first(&mpages, &slot); NULL != mpage;
-            mpage = ohash_next(&mpages, &slot)) {
-               mlink = mpage->mlinks;
-               if (debug)
-                       say(mlink->file, "Deleting from database");
-               if (nodb)
-                       continue;
-               for ( ; NULL != mlink; mlink = mlink->next) {
-                       i = 1;
-                       SQL_BIND_TEXT(stmts[STMT_DELETE_PAGE],
-                           i, mlink->dsec);
-                       SQL_BIND_TEXT(stmts[STMT_DELETE_PAGE],
-                           i, mlink->arch);
-                       SQL_BIND_TEXT(stmts[STMT_DELETE_PAGE],
-                           i, mlink->name);
-                       SQL_STEP(stmts[STMT_DELETE_PAGE]);
-                       sqlite3_reset(stmts[STMT_DELETE_PAGE]);
+       struct dba_array        *page, *files;
+       char                    *file;
+
+       dba_array_FOREACH(dba->pages, page) {
+               files = dba_array_get(page, DBP_FILE);
+               dba_array_FOREACH(files, file) {
+                       if (*file < ' ')
+                               file++;
+                       if (ohash_find(&mlinks, ohash_qlookup(&mlinks,
+                           file)) != NULL) {
+                               if (debug)
+                                       say(file, "Deleting from database");
+                               dba_array_del(dba->pages);
+                               break;
+                       }
                }
        }
                }
        }
-
-       if (0 == nodb)
-               SQL_EXEC("END TRANSACTION");
 }
 
 /*
 }
 
 /*
- * Close an existing database and its prepared statements.
- * If "real" is not set, rename the temporary file into the real one.
+ * Write the database from memory to disk.
  */
 static void
  */
 static void
-dbclose(int real)
+dbwrite(struct dba *dba)
 {
 {
-       size_t           i;
+       char             tfn[32];
        int              status;
        pid_t            child;
 
        int              status;
        pid_t            child;
 
-       if (nodb)
+       if (dba_write(MANDOC_DB "~", dba) != -1) {
+               if (rename(MANDOC_DB "~", MANDOC_DB) == -1) {
+                       exitcode = (int)MANDOCLEVEL_SYSERR;
+                       say(MANDOC_DB, "&rename");
+                       unlink(MANDOC_DB "~");
+               }
                return;
                return;
-
-       for (i = 0; i < STMT__MAX; i++) {
-               sqlite3_finalize(stmts[i]);
-               stmts[i] = NULL;
        }
 
        }
 
-       sqlite3_close(db);
-       db = NULL;
-
-       if (real)
+       (void)strlcpy(tfn, "/tmp/mandocdb.XXXXXXXX", sizeof(tfn));
+       if (mkdtemp(tfn) == NULL) {
+               exitcode = (int)MANDOCLEVEL_SYSERR;
+               say("", "&%s", tfn);
                return;
                return;
+       }
 
 
-       if ('\0' == *tempfilename) {
-               if (-1 == rename(MANDOC_DB "~", MANDOC_DB)) {
-                       exitcode = (int)MANDOCLEVEL_SYSERR;
-                       say(MANDOC_DB, "&rename");
-               }
-               return;
+       (void)strlcat(tfn, "/" MANDOC_DB, sizeof(tfn));
+       if (dba_write(tfn, dba) == -1) {
+               exitcode = (int)MANDOCLEVEL_SYSERR;
+               say(tfn, "&dba_write");
+               goto out;
        }
 
        switch (child = fork()) {
        }
 
        switch (child = fork()) {
@@ -2131,14 +2105,13 @@ dbclose(int real)
                say("", "&fork cmp");
                return;
        case 0:
                say("", "&fork cmp");
                return;
        case 0:
-               execlp("cmp", "cmp", "-s",
-                   tempfilename, MANDOC_DB, NULL);
+               execlp("cmp", "cmp", "-s", tfn, MANDOC_DB, (char *)NULL);
                say("", "&exec cmp");
                exit(0);
        default:
                break;
        }
                say("", "&exec cmp");
                exit(0);
        default:
                break;
        }
-       if (-1 == waitpid(child, &status, 0)) {
+       if (waitpid(child, &status, 0) == -1) {
                exitcode = (int)MANDOCLEVEL_SYSERR;
                say("", "&wait cmp");
        } else if (WIFSIGNALED(status)) {
                exitcode = (int)MANDOCLEVEL_SYSERR;
                say("", "&wait cmp");
        } else if (WIFSIGNALED(status)) {
@@ -2150,238 +2123,107 @@ dbclose(int real)
                    "Data changed, but cannot replace database");
        }
 
                    "Data changed, but cannot replace database");
        }
 
-       *strrchr(tempfilename, '/') = '\0';
+out:
+       *strrchr(tfn, '/') = '\0';
        switch (child = fork()) {
        case -1:
                exitcode = (int)MANDOCLEVEL_SYSERR;
                say("", "&fork rm");
                return;
        case 0:
        switch (child = fork()) {
        case -1:
                exitcode = (int)MANDOCLEVEL_SYSERR;
                say("", "&fork rm");
                return;
        case 0:
-               execlp("rm", "rm", "-rf", tempfilename, NULL);
+               execlp("rm", "rm", "-rf", tfn, (char *)NULL);
                say("", "&exec rm");
                exit((int)MANDOCLEVEL_SYSERR);
        default:
                break;
        }
                say("", "&exec rm");
                exit((int)MANDOCLEVEL_SYSERR);
        default:
                break;
        }
-       if (-1 == waitpid(child, &status, 0)) {
+       if (waitpid(child, &status, 0) == -1) {
                exitcode = (int)MANDOCLEVEL_SYSERR;
                say("", "&wait rm");
        } else if (WIFSIGNALED(status) || WEXITSTATUS(status)) {
                exitcode = (int)MANDOCLEVEL_SYSERR;
                exitcode = (int)MANDOCLEVEL_SYSERR;
                say("", "&wait rm");
        } else if (WIFSIGNALED(status) || WEXITSTATUS(status)) {
                exitcode = (int)MANDOCLEVEL_SYSERR;
-               say("", "%s: Cannot remove temporary directory",
-                   tempfilename);
+               say("", "%s: Cannot remove temporary directory", tfn);
        }
 }
 
        }
 }
 
-/*
- * This is straightforward stuff.
- * Open a database connection to a "temporary" database, then open a set
- * of prepared statements we'll use over and over again.
- * If "real" is set, we use the existing database; if not, we truncate a
- * temporary one.
- * Must be matched by dbclose().
- */
 static int
 static int
-dbopen(int real)
+set_basedir(const char *targetdir, int report_baddir)
 {
 {
-       const char      *sql;
-       int              rc, ofl;
-
-       if (nodb)
-               return(1);
-
-       *tempfilename = '\0';
-       ofl = SQLITE_OPEN_READWRITE;
-
-       if (real) {
-               rc = sqlite3_open_v2(MANDOC_DB, &db, ofl, NULL);
-               if (SQLITE_OK != rc) {
-                       exitcode = (int)MANDOCLEVEL_SYSERR;
-                       say(MANDOC_DB, "%s", sqlite3_errmsg(db));
-                       return(0);
-               }
-               goto prepare_statements;
-       }
-
-       ofl |= SQLITE_OPEN_CREATE | SQLITE_OPEN_EXCLUSIVE;
-
-       remove(MANDOC_DB "~");
-       rc = sqlite3_open_v2(MANDOC_DB "~", &db, ofl, NULL);
-       if (SQLITE_OK == rc)
-               goto create_tables;
-       if (MPARSE_QUICK & mparse_options) {
-               exitcode = (int)MANDOCLEVEL_SYSERR;
-               say(MANDOC_DB "~", "%s", sqlite3_errmsg(db));
-               return(0);
-       }
-
-       if (strlcpy(tempfilename, "/tmp/mandocdb.XXXXXX",
-           sizeof(tempfilename)) >= sizeof(tempfilename)) {
-               exitcode = (int)MANDOCLEVEL_SYSERR;
-               say("", "/tmp/mandocdb.XXXXXX: Filename too long");
-               return(0);
-       }
-       if (NULL == mkdtemp(tempfilename)) {
-               exitcode = (int)MANDOCLEVEL_SYSERR;
-               say("", "&%s", tempfilename);
-               return(0);
-       }
-       if (strlcat(tempfilename, "/" MANDOC_DB,
-           sizeof(tempfilename)) >= sizeof(tempfilename)) {
-               exitcode = (int)MANDOCLEVEL_SYSERR;
-               say("", "%s/" MANDOC_DB ": Filename too long",
-                   tempfilename);
-               return(0);
-       }
-       rc = sqlite3_open_v2(tempfilename, &db, ofl, NULL);
-       if (SQLITE_OK != rc) {
-               exitcode = (int)MANDOCLEVEL_SYSERR;
-               say("", "%s: %s", tempfilename, sqlite3_errmsg(db));
-               return(0);
-       }
+       static char      startdir[PATH_MAX];
+       static int       getcwd_status;  /* 1 = ok, 2 = failure */
+       static int       chdir_status;  /* 1 = changed directory */
+       char            *cp;
 
 
-create_tables:
-       sql = "CREATE TABLE \"mpages\" (\n"
-             " \"desc\" TEXT NOT NULL,\n"
-             " \"form\" INTEGER NOT NULL,\n"
-             " \"pageid\" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL\n"
-             ");\n"
-             "\n"
-             "CREATE TABLE \"mlinks\" (\n"
-             " \"sec\" TEXT NOT NULL,\n"
-             " \"arch\" TEXT NOT NULL,\n"
-             " \"name\" TEXT NOT NULL,\n"
-             " \"pageid\" INTEGER NOT NULL REFERENCES mpages(pageid) "
-               "ON DELETE CASCADE\n"
-             ");\n"
-             "CREATE INDEX mlinks_pageid_idx ON mlinks (pageid);\n"
-             "\n"
-             "CREATE TABLE \"names\" (\n"
-             " \"bits\" INTEGER NOT NULL,\n"
-             " \"name\" TEXT NOT NULL,\n"
-             " \"pageid\" INTEGER NOT NULL REFERENCES mpages(pageid) "
-               "ON DELETE CASCADE\n"
-             ");\n"
-             "\n"
-             "CREATE TABLE \"keys\" (\n"
-             " \"bits\" INTEGER NOT NULL,\n"
-             " \"key\" TEXT NOT NULL,\n"
-             " \"pageid\" INTEGER NOT NULL REFERENCES mpages(pageid) "
-               "ON DELETE CASCADE\n"
-             ");\n"
-             "CREATE INDEX keys_pageid_idx ON keys (pageid);\n";
-
-       if (SQLITE_OK != sqlite3_exec(db, sql, NULL, NULL, NULL)) {
-               exitcode = (int)MANDOCLEVEL_SYSERR;
-               say(MANDOC_DB, "%s", sqlite3_errmsg(db));
-               return(0);
+       /*
+        * Remember the original working directory, if possible.
+        * This will be needed if the second or a later directory
+        * on the command line is given as a relative path.
+        * Do not error out if the current directory is not
+        * searchable: Maybe it won't be needed after all.
+        */
+       if (0 == getcwd_status) {
+               if (NULL == getcwd(startdir, sizeof(startdir))) {
+                       getcwd_status = 2;
+                       (void)strlcpy(startdir, strerror(errno),
+                           sizeof(startdir));
+               } else
+                       getcwd_status = 1;
        }
 
        }
 
-prepare_statements:
-       SQL_EXEC("PRAGMA foreign_keys = ON");
-       sql = "DELETE FROM mpages WHERE pageid IN "
-               "(SELECT pageid FROM mlinks WHERE "
-               "sec=? AND arch=? AND name=?)";
-       sqlite3_prepare_v2(db, sql, -1, &stmts[STMT_DELETE_PAGE], NULL);
-       sql = "INSERT INTO mpages "
-               "(desc,form) VALUES (?,?)";
-       sqlite3_prepare_v2(db, sql, -1, &stmts[STMT_INSERT_PAGE], NULL);
-       sql = "INSERT INTO mlinks "
-               "(sec,arch,name,pageid) VALUES (?,?,?,?)";
-       sqlite3_prepare_v2(db, sql, -1, &stmts[STMT_INSERT_LINK], NULL);
-       sql = "INSERT INTO names "
-               "(bits,name,pageid) VALUES (?,?,?)";
-       sqlite3_prepare_v2(db, sql, -1, &stmts[STMT_INSERT_NAME], NULL);
-       sql = "INSERT INTO keys "
-               "(bits,key,pageid) VALUES (?,?,?)";
-       sqlite3_prepare_v2(db, sql, -1, &stmts[STMT_INSERT_KEY], NULL);
-
-#ifndef __APPLE__
        /*
        /*
-        * When opening a new database, we can turn off
-        * synchronous mode for much better performance.
+        * We are leaving the old base directory.
+        * Do not use it any longer, not even for messages.
         */
         */
-
-       if (real)
-               SQL_EXEC("PRAGMA synchronous = OFF");
-#endif
-
-       return(1);
-}
-
-static void *
-hash_halloc(size_t sz, void *arg)
-{
-
-       return(mandoc_calloc(sz, 1));
-}
-
-static void *
-hash_alloc(size_t sz, void *arg)
-{
-
-       return(mandoc_malloc(sz));
-}
-
-static void
-hash_free(void *p, size_t sz, void *arg)
-{
-
-       free(p);
-}
-
-static int
-set_basedir(const char *targetdir)
-{
-       static char      startdir[PATH_MAX];
-       static int       fd;
+       *basedir = '\0';
 
        /*
 
        /*
-        * Remember where we started by keeping a fd open to the origin
-        * path component: throughout this utility, we chdir() a lot to
-        * handle relative paths, and by doing this, we can return to
-        * the starting point.
+        * If and only if the directory was changed earlier and
+        * the next directory to process is given as a relative path,
+        * first go back, or bail out if that is impossible.
         */
         */
-       if ('\0' == *startdir) {
-               if (NULL == getcwd(startdir, PATH_MAX)) {
+       if (chdir_status && '/' != *targetdir) {
+               if (2 == getcwd_status) {
                        exitcode = (int)MANDOCLEVEL_SYSERR;
                        exitcode = (int)MANDOCLEVEL_SYSERR;
-                       if (NULL != targetdir)
-                               say("", "&getcwd");
-                       return(0);
+                       say("", "getcwd: %s", startdir);
+                       return 0;
                }
                }
-               if (-1 == (fd = open(startdir, O_RDONLY, 0))) {
-                       exitcode = (int)MANDOCLEVEL_SYSERR;
-                       say("", "&open %s", startdir);
-                       return(0);
-               }
-               if (NULL == targetdir)
-                       targetdir = startdir;
-       } else {
-               if (-1 == fd)
-                       return(0);
-               if (-1 == fchdir(fd)) {
-                       close(fd);
-                       basedir[0] = '\0';
+               if (-1 == chdir(startdir)) {
                        exitcode = (int)MANDOCLEVEL_SYSERR;
                        say("", "&chdir %s", startdir);
                        exitcode = (int)MANDOCLEVEL_SYSERR;
                        say("", "&chdir %s", startdir);
-                       return(0);
-               }
-               if (NULL == targetdir) {
-                       close(fd);
-                       return(1);
+                       return 0;
                }
        }
                }
        }
+
+       /*
+        * Always resolve basedir to the canonicalized absolute
+        * pathname and append a trailing slash, such that
+        * we can reliably check whether files are inside.
+        */
        if (NULL == realpath(targetdir, basedir)) {
        if (NULL == realpath(targetdir, basedir)) {
-               basedir[0] = '\0';
-               exitcode = (int)MANDOCLEVEL_BADARG;
-               say("", "&%s: realpath", targetdir);
-               return(0);
+               if (report_baddir || errno != ENOENT) {
+                       exitcode = (int)MANDOCLEVEL_BADARG;
+                       say("", "&%s: realpath", targetdir);
+               }
+               return 0;
        } else if (-1 == chdir(basedir)) {
        } else if (-1 == chdir(basedir)) {
-               exitcode = (int)MANDOCLEVEL_BADARG;
-               say("", "&chdir");
-               return(0);
+               if (report_baddir || errno != ENOENT) {
+                       exitcode = (int)MANDOCLEVEL_BADARG;
+                       say("", "&chdir");
+               }
+               return 0;
+       }
+       chdir_status = 1;
+       cp = strchr(basedir, '\0');
+       if ('/' != cp[-1]) {
+               if (cp - basedir >= PATH_MAX - 1) {
+                       exitcode = (int)MANDOCLEVEL_SYSERR;
+                       say("", "Filename too long");
+                       return 0;
+               }
+               *cp++ = '/';
+               *cp = '\0';
        }
        }
-       return(1);
+       return 1;
 }
 
 static void
 }
 
 static void
@@ -2393,7 +2235,7 @@ say(const char *file, const char *format, ...)
        if ('\0' != *basedir)
                fprintf(stderr, "%s", basedir);
        if ('\0' != *basedir && '\0' != *file)
        if ('\0' != *basedir)
                fprintf(stderr, "%s", basedir);
        if ('\0' != *basedir && '\0' != *file)
-               fputs("//", stderr);
+               fputc('/', stderr);
        if ('\0' != *file)
                fprintf(stderr, "%s", file);
 
        if ('\0' != *file)
                fprintf(stderr, "%s", file);
 
A git conversion mirror of mandoc.bsd.lv