]> 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
Replace the structs mdoc and man by a unified struct roff_man.
[mandoc.git] / mandocdb.c
diff --git a/mandocdb.c b/mandocdb.c
index 7ad55a50a22d61920e8f27e63941a17652cd6bd9..03f6ab20590ed5cfc9dfbc5a967a26395e8da2ef 100644 (file)
--- a/mandocdb.c
+++ b/mandocdb.c
@@ -1,15 +1,15 @@
-/*     $Id: mandocdb.c,v 1.160 2014/09/01 23:47:59 schwarze Exp $ */
+/*     $Id: mandocdb.c,v 1.191 2015/04/18 16:06:40 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-2015 Ingo Schwarze <schwarze@openbsd.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
  * 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
@@ -17,8 +17,8 @@
  */
 #include "config.h"
 
  */
 #include "config.h"
 
-#include <sys/stat.h>
 #include <sys/types.h>
 #include <sys/types.h>
+#include <sys/stat.h>
 #include <sys/wait.h>
 
 #include <assert.h>
 #include <sys/wait.h>
 
 #include <assert.h>
@@ -46,11 +46,12 @@
 #endif
 #include <sqlite3.h>
 
 #endif
 #include <sqlite3.h>
 
+#include "mandoc_aux.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"
 
 extern int mansearch_keymax;
 #include "mansearch.h"
 
 extern int mansearch_keymax;
@@ -83,17 +84,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 {
@@ -104,24 +98,25 @@ struct     inodev {
 struct mpage {
        struct inodev    inodev;  /* used for hashing routine */
        int64_t          pageid;  /* pageid in mpages SQL table */
 struct mpage {
        struct inodev    inodev;  /* used for hashing routine */
        int64_t          pageid;  /* pageid in mpages SQL table */
-       enum form        form;    /* format 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 mlink    *mlinks;  /* singly linked list */
        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 mlink    *mlinks;  /* singly linked list */
+       int              form;    /* format from file content */
+       int              name_head_done;
 };
 
 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            *fsec;    /* section from file name suffix */
        struct mlink    *next;    /* singly linked list */
        struct mpage    *mpage;   /* parent */
        char            *dsec;    /* section from directory */
        char            *arch;    /* architecture from directory */
        char            *name;    /* name from file name (not empty) */
        char            *fsec;    /* section from file name suffix */
        struct mlink    *next;    /* singly linked list */
        struct mpage    *mpage;   /* parent */
+       int              dform;   /* format from directory */
+       int              fform;   /* format from file name suffix */
        int              gzip;    /* filename has a .gz suffix */
 };
 
        int              gzip;    /* filename has a .gz suffix */
 };
 
@@ -130,11 +125,13 @@ enum      stmt {
        STMT_INSERT_PAGE,       /* insert mpage */
        STMT_INSERT_LINK,       /* insert mlink */
        STMT_INSERT_NAME,       /* insert name */
        STMT_INSERT_PAGE,       /* insert mpage */
        STMT_INSERT_LINK,       /* insert mlink */
        STMT_INSERT_NAME,       /* insert name */
+       STMT_SELECT_NAME,       /* retrieve existing name flags */
        STMT_INSERT_KEY,        /* insert parsed key */
        STMT__MAX
 };
 
        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 */
 
 struct mdoc_handler {
        mdoc_fp          fp; /* optional handler */
@@ -142,8 +139,9 @@ struct      mdoc_handler {
 };
 
 static void     dbclose(int);
 };
 
 static void     dbclose(int);
-static void     dbadd(struct mpage *, struct mchars *);
+static void     dbadd(struct mpage *);
 static void     dbadd_mlink(const struct mlink *mlink);
 static void     dbadd_mlink(const struct mlink *mlink);
+static void     dbadd_mlink_name(const struct mlink *mlink);
 static int      dbopen(int);
 static void     dbprune(void);
 static void     filescan(const char *);
 static int      dbopen(int);
 static void     dbprune(void);
 static void     filescan(const char *);
@@ -155,27 +153,39 @@ 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_free(struct mlink *);
 static void     mlinks_undupe(struct mpage *);
 static void     mpages_free(void);
-static void     mpages_merge(struct mchars *, struct mparse *);
+static void     mpages_merge(struct mparse *);
 static void     names_check(void);
 static void     parse_cat(struct mpage *, int);
 static void     names_check(void);
 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_body(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_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 *);
+                       const struct roff_node *, uint64_t);
+static int      render_string(char **, size_t *);
 static void     say(const char *, const char *, ...);
 static void     say(const char *, const char *, ...);
-static int      set_basedir(const char *);
+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]);
 
@@ -190,6 +200,7 @@ 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 mchars   *mchars; /* table of named characters */
 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     mpages; /* table of distinct manual pages */
 static struct ohash     mlinks; /* table of directory entries */
 static struct ohash     names; /* table of all names */
@@ -295,7 +306,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 */
@@ -321,26 +332,27 @@ 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 mparse    *mp;
+       struct manconf    conf;
        struct ohash_info mpages_info, mlinks_info;
        struct ohash_info mpages_info, mlinks_info;
+       struct mparse    *mp;
+       const char       *path_arg;
+       size_t            j, sz;
+       int               ch, i;
 
 
+       memset(&conf, 0, sizeof(conf));
        memset(stmts, 0, STMT__MAX * sizeof(sqlite3_stmt *));
        memset(stmts, 0, STMT__MAX * sizeof(sqlite3_stmt *));
-       memset(&dirs, 0, sizeof(struct manpaths));
 
        mpages_info.alloc  = mlinks_info.alloc  = hash_alloc;
        mpages_info.calloc = mlinks_info.calloc = hash_calloc;
 
        mpages_info.alloc  = mlinks_info.alloc  = hash_alloc;
        mpages_info.calloc = mlinks_info.calloc = hash_calloc;
-       mpages_info.free  = mlinks_info.free  = hash_free;
+       mpages_info.free   = mlinks_info.free   = hash_free;
+       mpages_info.data   = mlinks_info.data   = NULL;
 
        mpages_info.key_offset = offsetof(struct mpage, inodev);
        mlinks_info.key_offset = offsetof(struct mlink, file);
 
        mpages_info.key_offset = offsetof(struct mpage, inodev);
        mlinks_info.key_offset = offsetof(struct mlink, file);
@@ -430,9 +442,9 @@ main(int argc, char *argv[])
        }
 
        exitcode = (int)MANDOCLEVEL_OK;
        }
 
        exitcode = (int)MANDOCLEVEL_OK;
-       mp = mparse_alloc(mparse_options, MANDOCLEVEL_FATAL, NULL, NULL);
-       mc = mchars_alloc();
-
+       mchars = mchars_alloc();
+       mp = mparse_alloc(mparse_options, MANDOCLEVEL_BADARG, NULL,
+           mchars, NULL);
        ohash_init(&mpages, 6, &mpages_info);
        ohash_init(&mlinks, 6, &mlinks_info);
 
        ohash_init(&mpages, 6, &mpages_info);
        ohash_init(&mlinks, 6, &mlinks_info);
 
@@ -442,7 +454,7 @@ main(int argc, char *argv[])
                 * Most of these deal with a specific directory.
                 * Jump into that directory first.
                 */
                 * Most of these deal with a specific directory.
                 * Jump into that directory first.
                 */
-               if (OP_TEST != op && 0 == set_basedir(path_arg))
+               if (OP_TEST != op && 0 == set_basedir(path_arg, 1))
                        goto out;
 
                if (dbopen(1)) {
                        goto out;
 
                if (dbopen(1)) {
@@ -468,24 +480,24 @@ main(int argc, char *argv[])
                                goto out;
                }
                if (OP_DELETE != op)
                                goto out;
                }
                if (OP_DELETE != op)
-                       mpages_merge(mc, mp);
+                       mpages_merge(mp);
                dbclose(OP_DEFAULT == op ? 0 : 1);
        } else {
                /*
                 * If we have arguments, use them as our manpaths.
                 * If we don't, grok from manpath(1) or however else
                dbclose(OP_DEFAULT == op ? 0 : 1);
        } 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.
+                * manconf_parse() wants to do it.
                 */
                if (argc > 0) {
                 */
                if (argc > 0) {
-                       dirs.paths = mandoc_reallocarray(NULL,
+                       conf.manpath.paths = mandoc_reallocarray(NULL,
                            argc, sizeof(char *));
                            argc, sizeof(char *));
-                       dirs.sz = (size_t)argc;
+                       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");
                }
@@ -496,10 +508,10 @@ 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 (0 == sz)
                                continue;
 
@@ -508,20 +520,20 @@ main(int argc, char *argv[])
                                ohash_init(&mlinks, 6, &mlinks_info);
                        }
 
                                ohash_init(&mlinks, 6, &mlinks_info);
                        }
 
-                       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;
+                               continue;
                        if (0 == dbopen(0))
                        if (0 == dbopen(0))
-                               goto out;
+                               continue;
 
 
-                       mpages_merge(mc, mp);
+                       mpages_merge(mp);
                        if (warnings && !nodb &&
                            ! (MPARSE_QUICK & mparse_options))
                                names_check();
                        dbclose(0);
 
                        if (warnings && !nodb &&
                            ! (MPARSE_QUICK & mparse_options))
                                names_check();
                        dbclose(0);
 
-                       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);
@@ -529,9 +541,9 @@ main(int argc, char *argv[])
                }
        }
 out:
                }
        }
 out:
-       manpath_free(&dirs);
-       mchars_free(mc);
+       manconf_free(&conf);
        mparse_free(mp);
        mparse_free(mp);
+       mchars_free(mchars);
        mpages_free();
        ohash_delete(&mpages);
        ohash_delete(&mlinks);
        mpages_free();
        ohash_delete(&mpages);
        ohash_delete(&mlinks);
@@ -602,7 +614,11 @@ treescan(void)
                                        say(path, "&realpath");
                                continue;
                        }
                                        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;
                                if (warnings) say("",
                                    "%s: outside base directory", buf);
                                continue;
@@ -657,7 +673,8 @@ treescan(void)
                                        say(path, "Skip pdf");
                                continue;
                        } else if ( ! use_all &&
                                        say(path, "Skip pdf");
                                continue;
                        } else if ( ! use_all &&
-                           ((FORM_SRC == dform && strcmp(fsec, dsec)) ||
+                           ((FORM_SRC == dform &&
+                             strncmp(fsec, dsec, strlen(dsec))) ||
                             (FORM_CAT == dform && strcmp(fsec, "0")))) {
                                if (warnings)
                                        say(path, "Wrong filename suffix");
                             (FORM_CAT == dform && strcmp(fsec, "0")))) {
                                if (warnings)
                                        say(path, "Wrong filename suffix");
@@ -807,6 +824,10 @@ filescan(const char *file)
                start = buf;
        else if (strstr(buf, basedir) == buf)
                start = buf + strlen(basedir);
                start = buf;
        else if (strstr(buf, basedir) == buf)
                start = buf + strlen(basedir);
+#ifdef HOMEBREWDIR
+       else if (strstr(buf, HOMEBREWDIR) == 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);
@@ -838,9 +859,11 @@ filescan(const char *file)
        }
 
        mlink = mandoc_calloc(1, sizeof(struct mlink));
        }
 
        mlink = mandoc_calloc(1, sizeof(struct mlink));
+       mlink->dform = FORM_NONE;
        if (strlcpy(mlink->file, start, sizeof(mlink->file)) >=
            sizeof(mlink->file)) {
                say(start, "Filename too long");
        if (strlcpy(mlink->file, start, sizeof(mlink->file)) >=
            sizeof(mlink->file)) {
                say(start, "Filename too long");
+               free(mlink);
                return;
        }
 
                return;
        }
 
@@ -920,6 +943,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,
@@ -1077,34 +1101,32 @@ 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 mparse *mp)
 {
        char                     any[] = "any";
        struct ohash_info        str_info;
 {
        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         *mdoc;
+       struct roff_man         *man;
        char                    *sodest;
        char                    *cp;
        char                    *sodest;
        char                    *cp;
-       pid_t                    child_pid;
-       int                      status;
+       int                      fd;
        unsigned int             pslot;
        unsigned int             pslot;
-       enum mandoclevel         lvl;
 
        str_info.alloc = hash_alloc;
        str_info.calloc = hash_calloc;
        str_info.free = hash_free;
 
        str_info.alloc = hash_alloc;
        str_info.calloc = hash_calloc;
        str_info.free = hash_free;
+       str_info.data = NULL;
        str_info.key_offset = offsetof(struct str, key);
 
        str_info.key_offset = offsetof(struct str, key);
 
-       if (0 == nodb)
+       if ( ! nodb)
                SQL_EXEC("BEGIN TRANSACTION");
 
        mpage = ohash_first(&mpages, &pslot);
                SQL_EXEC("BEGIN TRANSACTION");
 
        mpage = ohash_first(&mpages, &pslot);
-       while (NULL != mpage) {
+       while (mpage != NULL) {
                mlinks_undupe(mpage);
                mlinks_undupe(mpage);
-               if (NULL == mpage->mlinks) {
+               if ((mlink = mpage->mlinks) == NULL) {
                        mpage = ohash_next(&mpages, &pslot);
                        continue;
                }
                        mpage = ohash_next(&mpages, &pslot);
                        continue;
                }
@@ -1116,62 +1138,36 @@ mpages_merge(struct mchars *mc, struct mparse *mp)
                mdoc = NULL;
                man = NULL;
                sodest = NULL;
                mdoc = 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;
-                       }
+
+               mparse_open(mp, &fd, mlink->file);
+               if (fd == -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);
+                       mparse_result(mp, &mdoc, &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;
 
@@ -1185,9 +1181,9 @@ mpages_merge(struct mchars *mc, struct mparse *mp)
                                         */
 
                                        if (mpage_dest->pageid)
                                         */
 
                                        if (mpage_dest->pageid)
-                                               dbadd_mlink(mlink);
+                                               dbadd_mlink_name(mlink);
 
 
-                                       if (NULL == mlink->next)
+                                       if (mlink->next == NULL)
                                                break;
                                        mlink = mlink->next;
                                }
                                                break;
                                        mlink = mlink->next;
                                }
@@ -1199,38 +1195,32 @@ mpages_merge(struct mchars *mc, struct mparse *mp)
                                mpage->mlinks = NULL;
                        }
                        goto nextpage;
                                mpage->mlinks = NULL;
                        }
                        goto nextpage;
-               } else if (NULL != mdoc) {
+               } else if (mdoc != NULL) {
                        mpage->form = FORM_SRC;
                        mpage->sec = mdoc_meta(mdoc)->msec;
                        mpage->sec = mandoc_strdup(
                        mpage->form = FORM_SRC;
                        mpage->sec = mdoc_meta(mdoc)->msec;
                        mpage->sec = mandoc_strdup(
-                           NULL == mpage->sec ? "" : mpage->sec);
+                           mpage->sec == NULL ? "" : mpage->sec);
                        mpage->arch = mdoc_meta(mdoc)->arch;
                        mpage->arch = mandoc_strdup(
                        mpage->arch = mdoc_meta(mdoc)->arch;
                        mpage->arch = mandoc_strdup(
-                           NULL == mpage->arch ? "" : mpage->arch);
+                           mpage->arch == NULL ? "" : mpage->arch);
                        mpage->title =
                            mandoc_strdup(mdoc_meta(mdoc)->title);
                        mpage->title =
                            mandoc_strdup(mdoc_meta(mdoc)->title);
-               } else if (NULL != man) {
+               } else if (man != NULL) {
                        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(man)->msec);
+                       mpage->arch = mandoc_strdup(mlink->arch);
+                       mpage->title = mandoc_strdup(man_meta(man)->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);
+                       mpage->sec = mandoc_strdup(mlink->dsec);
+                       mpage->arch = mandoc_strdup(mlink->arch);
+                       mpage->title = mandoc_strdup(mlink->name);
                }
                putkey(mpage, mpage->sec, TYPE_sec);
                }
                putkey(mpage, mpage->sec, TYPE_sec);
-               putkey(mpage, '\0' == *mpage->arch ?
-                   any : mpage->arch, TYPE_arch);
+               if (*mpage->arch != '\0')
+                       putkey(mpage, mpage->arch, TYPE_arch);
 
 
-               for (mlink = mpage->mlinks; mlink; mlink = mlink->next) {
+               for ( ; mlink != NULL; mlink = mlink->next) {
                        if ('\0' != *mlink->dsec)
                                putkey(mpage, mlink->dsec, TYPE_sec);
                        if ('\0' != *mlink->fsec)
                        if ('\0' != *mlink->dsec)
                                putkey(mpage, mlink->dsec, TYPE_sec);
                        if ('\0' != *mlink->fsec)
@@ -1240,16 +1230,14 @@ mpages_merge(struct mchars *mc, struct mparse *mp)
                        putkey(mpage, mlink->name, NAME_FILE);
                }
 
                        putkey(mpage, mlink->name, NAME_FILE);
                }
 
-               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 (mdoc != NULL)
+                       parse_mdoc(mpage, mdoc_meta(mdoc), mdoc_node(mdoc));
+               else if (man != NULL)
+                       parse_man(mpage, man_meta(man), man_node(man));
                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)
@@ -1257,24 +1245,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(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));
-                       }
+               if (mparse_wait(mp) != MANDOCLEVEL_OK) {
+                       exitcode = (int)MANDOCLEVEL_SYSERR;
+                       say(mlink->file, "&wait gunzip");
                }
                ohash_delete(&strings);
                ohash_delete(&names);
                }
                ohash_delete(&strings);
                ohash_delete(&names);
@@ -1454,21 +1431,22 @@ 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;
@@ -1483,13 +1461,13 @@ 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;
                assert(body->parent);
                if (NULL != (head = body->parent->head) &&
                    1 == head->nchild &&
                    NULL != (head = (head->child)) &&
                body = n;
                assert(body->parent);
                if (NULL != (head = body->parent->head) &&
                    1 == head->nchild &&
                    NULL != (head = (head->child)) &&
-                   MAN_TEXT == head->type &&
+                   head->type == ROFFT_TEXT &&
                    0 == strcmp(head->string, "NAME") &&
                    NULL != body->child) {
 
                    0 == strcmp(head->string, "NAME") &&
                    NULL != body->child) {
 
@@ -1532,6 +1510,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;
@@ -1546,6 +1529,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;
                        }
@@ -1576,51 +1564,53 @@ 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:
+               case ROFFT_ELEM:
                        /* FALLTHROUGH */
                        /* FALLTHROUGH */
-               case MDOC_BLOCK:
+               case ROFFT_BLOCK:
                        /* FALLTHROUGH */
                        /* FALLTHROUGH */
-               case MDOC_HEAD:
+               case ROFFT_HEAD:
                        /* FALLTHROUGH */
                        /* FALLTHROUGH */
-               case MDOC_BODY:
+               case ROFFT_BODY:
                        /* FALLTHROUGH */
                        /* FALLTHROUGH */
-               case MDOC_TAIL:
+               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)
+           n->type != ROFFT_TEXT)
                return(0);
 
        /*
                return(0);
 
        /*
@@ -1631,7 +1621,7 @@ parse_mdoc_Fd(struct mpage *mpage, const struct mdoc_node *n)
        if (strcmp("#include", n->string))
                return(0);
 
        if (strcmp("#include", n->string))
                return(0);
 
-       if (NULL == (n = n->next) || MDOC_TEXT != n->type)
+       if ((n = n->next) == NULL || n->type != ROFFT_TEXT)
                return(0);
 
        /*
                return(0);
 
        /*
@@ -1655,41 +1645,61 @@ parse_mdoc_Fd(struct mpage *mpage, const struct mdoc_node *n)
        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);
 
        return(0);
 }
 
 static int
                        putkey(mpage, n->string, TYPE_Fa);
 
        return(0);
 }
 
 static int
-parse_mdoc_Xr(struct mpage *mpage, const struct mdoc_node *n)
+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_Xr(struct mpage *mpage, const struct roff_meta *meta,
+       const struct roff_node *n)
 {
        char    *cp;
 
 {
        char    *cp;
 
@@ -1708,44 +1718,59 @@ parse_mdoc_Xr(struct mpage *mpage, const struct mdoc_node *n)
 }
 
 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)
+       if (n->type == ROFFT_BODY)
                mdoc_deroff(&mpage->desc, n);
        return(0);
 }
 
 static int
                mdoc_deroff(&mpage->desc, n);
        return(0);
 }
 
 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);
+       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, ROFFT_HEAD);
+               mpage->name_head_done = 1;
+       }
        return(0);
 }
 
 static int
        return(0);
 }
 
 static int
-parse_mdoc_Sh(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(SEC_CUSTOM == n->sec && MDOC_HEAD == n->type);
+       return(n->sec == SEC_CUSTOM && n->type == ROFFT_HEAD);
 }
 
 static int
 }
 
 static int
-parse_mdoc_head(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_HEAD == n->type);
+       return(n->type == ROFFT_HEAD);
 }
 
 static int
 }
 
 static int
-parse_mdoc_body(struct mpage *mpage, const struct mdoc_node *n)
+parse_mdoc_body(struct mpage *mpage, const struct roff_meta *meta,
+       const struct roff_node *n)
 {
 
 {
 
-       return(MDOC_BODY == n->type);
+       return(n->type == ROFFT_BODY);
 }
 
 /*
 }
 
 /*
@@ -1754,30 +1779,32 @@ 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=%d", sz, cp, v);
        } else {
                htab = &strings;
                if (debug > 1)
                    for (i = 0; i < mansearch_keymax; i++)
        } else {
                htab = &strings;
                if (debug > 1)
                    for (i = 0; i < mansearch_keymax; i++)
-                       if (1 << i & v)
+                       if ((uint64_t)1 << i & v)
                            say(mpage->mlinks->file,
                                "Adding key %s=%*s",
                                mansearch_keynames[i], sz, cp);
                            say(mpage->mlinks->file,
                                "Adding key %s=%*s",
                                mansearch_keynames[i], sz, cp);
@@ -1797,6 +1824,9 @@ putkeys(const struct mpage *mpage,
        }
        s->mpage = mpage;
        s->mask = v;
        }
        s->mpage = mpage;
        s->mask = v;
+
+       if (mustfree)
+               free(cp);
 }
 
 /*
 }
 
 /*
@@ -1852,20 +1882,19 @@ utf8(unsigned int cp, char out[7])
 }
 
 /*
 }
 
 /*
- * 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';
@@ -1874,68 +1903,62 @@ 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':
                        /* FALLTHROUGH */
                case ASCII_NBRSP:
                case '\t':
                        /* FALLTHROUGH */
                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;
 
                /*
@@ -1944,32 +1967,44 @@ 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(mchars, 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(mchars, 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;
+       }
+
+       /* Trim trailing whitespace and NUL-terminate. */
 
 
-       buf[pos] = '\0';
-       key->rendered = buf;
+       while (*psz > 0 && (*public)[*psz - 1] == ' ')
+               --*psz;
+       if (dst != NULL) {
+               (*public)[*psz] = '\0';
+               return(1);
+       } else
+               return(0);
 }
 
 static void
 }
 
 static void
@@ -1984,9 +2019,26 @@ dbadd_mlink(const struct mlink *mlink)
        SQL_BIND_INT64(stmts[STMT_INSERT_LINK], i, mlink->mpage->pageid);
        SQL_STEP(stmts[STMT_INSERT_LINK]);
        sqlite3_reset(stmts[STMT_INSERT_LINK]);
        SQL_BIND_INT64(stmts[STMT_INSERT_LINK], i, mlink->mpage->pageid);
        SQL_STEP(stmts[STMT_INSERT_LINK]);
        sqlite3_reset(stmts[STMT_INSERT_LINK]);
+}
+
+static void
+dbadd_mlink_name(const struct mlink *mlink)
+{
+       uint64_t         bits;
+       size_t           i;
+
+       dbadd_mlink(mlink);
 
        i = 1;
 
        i = 1;
-       SQL_BIND_INT64(stmts[STMT_INSERT_NAME], i, NAME_FILE);
+       SQL_BIND_INT64(stmts[STMT_SELECT_NAME], i, mlink->mpage->pageid);
+       bits = NAME_FILE & NAME_MASK;
+       if (sqlite3_step(stmts[STMT_SELECT_NAME]) == SQLITE_ROW) {
+               bits |= sqlite3_column_int64(stmts[STMT_SELECT_NAME], 0);
+               sqlite3_reset(stmts[STMT_SELECT_NAME]);
+       }
+
+       i = 1;
+       SQL_BIND_INT64(stmts[STMT_INSERT_NAME], i, bits);
        SQL_BIND_TEXT(stmts[STMT_INSERT_NAME], i, mlink->name);
        SQL_BIND_INT64(stmts[STMT_INSERT_NAME], i, mlink->mpage->pageid);
        SQL_STEP(stmts[STMT_INSERT_NAME]);
        SQL_BIND_TEXT(stmts[STMT_INSERT_NAME], i, mlink->name);
        SQL_BIND_INT64(stmts[STMT_INSERT_NAME], i, mlink->mpage->pageid);
        SQL_STEP(stmts[STMT_INSERT_NAME]);
@@ -2000,28 +2052,24 @@ dbadd_mlink(const struct mlink *mlink)
  * 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 mpage *mpage)
 {
        struct mlink    *mlink;
        struct str      *key;
 {
        struct mlink    *mlink;
        struct str      *key;
+       char            *cp;
        size_t           i;
        unsigned int     slot;
        size_t           i;
        unsigned int     slot;
+       int              mustfree;
 
        mlink = mpage->mlinks;
 
        if (nodb) {
                for (key = ohash_first(&names, &slot); NULL != key;
 
        mlink = mpage->mlinks;
 
        if (nodb) {
                for (key = ohash_first(&names, &slot); NULL != key;
-                    key = ohash_next(&names, &slot)) {
-                       if (key->rendered != key->key)
-                               free(key->rendered);
+                    key = ohash_next(&names, &slot))
                        free(key);
                        free(key);
-               }
                for (key = ohash_first(&strings, &slot); NULL != key;
                for (key = ohash_first(&strings, &slot); NULL != key;
-                    key = ohash_next(&strings, &slot)) {
-                       if (key->rendered != key->key)
-                               free(key->rendered);
+                    key = ohash_next(&strings, &slot))
                        free(key);
                        free(key);
-               }
                if (0 == debug)
                        return;
                while (NULL != mlink) {
                if (0 == debug)
                        return;
                while (NULL != mlink) {
@@ -2050,21 +2098,17 @@ dbadd(struct mpage *mpage, struct mchars *mc)
        if (debug)
                say(mlink->file, "Adding to database");
 
        if (debug)
                say(mlink->file, "Adding to database");
 
-       i = strlen(mpage->desc) + 1;
-       key = mandoc_calloc(1, sizeof(struct str) + i);
-       memcpy(key->key, mpage->desc, i);
-       render_key(mc, key);
-
+       cp = mpage->desc;
+       i = strlen(cp);
+       mustfree = render_string(&cp, &i);
        i = 1;
        i = 1;
-       SQL_BIND_TEXT(stmts[STMT_INSERT_PAGE], i, key->rendered);
-       SQL_BIND_INT(stmts[STMT_INSERT_PAGE], i, FORM_SRC == mpage->form);
+       SQL_BIND_TEXT(stmts[STMT_INSERT_PAGE], i, cp);
+       SQL_BIND_INT(stmts[STMT_INSERT_PAGE], i, mpage->form);
        SQL_STEP(stmts[STMT_INSERT_PAGE]);
        mpage->pageid = sqlite3_last_insert_rowid(db);
        sqlite3_reset(stmts[STMT_INSERT_PAGE]);
        SQL_STEP(stmts[STMT_INSERT_PAGE]);
        mpage->pageid = sqlite3_last_insert_rowid(db);
        sqlite3_reset(stmts[STMT_INSERT_PAGE]);
-
-       if (key->rendered != key->key)
-               free(key->rendered);
-       free(key);
+       if (mustfree)
+               free(cp);
 
        while (NULL != mlink) {
                dbadd_mlink(mlink);
 
        while (NULL != mlink) {
                dbadd_mlink(mlink);
@@ -2075,31 +2119,23 @@ dbadd(struct mpage *mpage, struct mchars *mc)
        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);
                i = 1;
                SQL_BIND_INT64(stmts[STMT_INSERT_NAME], i, key->mask);
-               SQL_BIND_TEXT(stmts[STMT_INSERT_NAME], i, key->rendered);
+               SQL_BIND_TEXT(stmts[STMT_INSERT_NAME], i, key->key);
                SQL_BIND_INT64(stmts[STMT_INSERT_NAME], i, mpage->pageid);
                SQL_STEP(stmts[STMT_INSERT_NAME]);
                sqlite3_reset(stmts[STMT_INSERT_NAME]);
                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);
                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);
                i = 1;
                SQL_BIND_INT64(stmts[STMT_INSERT_KEY], i, key->mask);
-               SQL_BIND_TEXT(stmts[STMT_INSERT_KEY], i, key->rendered);
+               SQL_BIND_TEXT(stmts[STMT_INSERT_KEY], i, key->key);
                SQL_BIND_INT64(stmts[STMT_INSERT_KEY], i, mpage->pageid);
                SQL_STEP(stmts[STMT_INSERT_KEY]);
                sqlite3_reset(stmts[STMT_INSERT_KEY]);
                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);
                free(key);
        }
 }
                free(key);
        }
 }
@@ -2299,7 +2335,8 @@ create_tables:
              " \"bits\" INTEGER NOT NULL,\n"
              " \"name\" TEXT NOT NULL,\n"
              " \"pageid\" INTEGER NOT NULL REFERENCES mpages(pageid) "
              " \"bits\" INTEGER NOT NULL,\n"
              " \"name\" TEXT NOT NULL,\n"
              " \"pageid\" INTEGER NOT NULL REFERENCES mpages(pageid) "
-               "ON DELETE CASCADE\n"
+               "ON DELETE CASCADE,\n"
+             " UNIQUE (\"name\", \"pageid\") ON CONFLICT REPLACE\n"
              ");\n"
              "\n"
              "CREATE TABLE \"keys\" (\n"
              ");\n"
              "\n"
              "CREATE TABLE \"keys\" (\n"
@@ -2337,6 +2374,8 @@ prepare_statements:
        sql = "INSERT INTO mlinks "
                "(sec,arch,name,pageid) VALUES (?,?,?,?)";
        sqlite3_prepare_v2(db, sql, -1, &stmts[STMT_INSERT_LINK], NULL);
        sql = "INSERT INTO mlinks "
                "(sec,arch,name,pageid) VALUES (?,?,?,?)";
        sqlite3_prepare_v2(db, sql, -1, &stmts[STMT_INSERT_LINK], NULL);
+       sql = "SELECT bits FROM names where pageid = ?";
+       sqlite3_prepare_v2(db, sql, -1, &stmts[STMT_SELECT_NAME], NULL);
        sql = "INSERT INTO names "
                "(bits,name,pageid) VALUES (?,?,?)";
        sqlite3_prepare_v2(db, sql, -1, &stmts[STMT_INSERT_NAME], NULL);
        sql = "INSERT INTO names "
                "(bits,name,pageid) VALUES (?,?,?)";
        sqlite3_prepare_v2(db, sql, -1, &stmts[STMT_INSERT_NAME], NULL);
@@ -2354,7 +2393,7 @@ prepare_statements:
            "PRAGMA synchronous = OFF", NULL, NULL, NULL)) {
                exitcode = (int)MANDOCLEVEL_SYSERR;
                say(MANDOC_DB, "PRAGMA synchronous: %s",
            "PRAGMA synchronous = OFF", NULL, NULL, NULL)) {
                exitcode = (int)MANDOCLEVEL_SYSERR;
                say(MANDOC_DB, "PRAGMA synchronous: %s",
-               sqlite3_errmsg(db));
+                   sqlite3_errmsg(db));
                sqlite3_close(db);
                return(0);
        }
                sqlite3_close(db);
                return(0);
        }
@@ -2385,7 +2424,7 @@ hash_free(void *p, void *arg)
 }
 
 static int
 }
 
 static int
-set_basedir(const char *targetdir)
+set_basedir(const char *targetdir, int report_baddir)
 {
        static char      startdir[PATH_MAX];
        static int       getcwd_status;  /* 1 = ok, 2 = failure */
 {
        static char      startdir[PATH_MAX];
        static int       getcwd_status;  /* 1 = ok, 2 = failure */
@@ -2438,12 +2477,16 @@ set_basedir(const char *targetdir)
         * we can reliably check whether files are inside.
         */
        if (NULL == realpath(targetdir, basedir)) {
         * we can reliably check whether files are inside.
         */
        if (NULL == realpath(targetdir, basedir)) {
-               exitcode = (int)MANDOCLEVEL_BADARG;
-               say("", "&%s: realpath", targetdir);
+               if (report_baddir || errno != ENOENT) {
+                       exitcode = (int)MANDOCLEVEL_BADARG;
+                       say("", "&%s: realpath", targetdir);
+               }
                return(0);
        } else if (-1 == chdir(basedir)) {
                return(0);
        } else if (-1 == chdir(basedir)) {
-               exitcode = (int)MANDOCLEVEL_BADARG;
-               say("", "&chdir");
+               if (report_baddir || errno != ENOENT) {
+                       exitcode = (int)MANDOCLEVEL_BADARG;
+                       say("", "&chdir");
+               }
                return(0);
        }
        chdir_status = 1;
                return(0);
        }
        chdir_status = 1;
A git conversion mirror of mandoc.bsd.lv