Switch to autogenerated dependency rules; they are less error-prone.

[mandoc.git] / mandocdb.c

diff --git a/mandocdb.c b/mandocdb.c
index 0e52888664cefced593b0d9d0f1314d35ac0724e..b3e34d05958d2198bdcba9b6add7e9ed7d3d0079 100644 (file)
--- a/mandocdb.c
+++ b/mandocdb.c
@@ -1,4 +1,4 @@
-/*     $Id: mandocdb.c,v 1.132 2014/04/09 21:50:08 schwarze Exp $ */
+/*     $Id: mandocdb.c,v 1.153 2014/06/21 16:18:25 schwarze Exp $ */

 /*
  * Copyright (c) 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011, 2012, 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>
 /*
  * Copyright (c) 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011, 2012, 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>


@@ -55,22 +55,22 @@ extern const char *const mansearch_keynames[];
 
 #define        SQL_EXEC(_v) \
        if (SQLITE_OK != sqlite3_exec(db, (_v), NULL, NULL, NULL)) \
 
 #define        SQL_EXEC(_v) \
        if (SQLITE_OK != sqlite3_exec(db, (_v), NULL, NULL, NULL)) \

-               fprintf(stderr, "%s\n", sqlite3_errmsg(db))
+               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)) \
 #define        SQL_BIND_TEXT(_s, _i, _v) \
        if (SQLITE_OK != sqlite3_bind_text \
                ((_s), (_i)++, (_v), -1, SQLITE_STATIC)) \

-               fprintf(stderr, "%s\n", sqlite3_errmsg(db))
+               say(mlink->file, "%s", sqlite3_errmsg(db))

 #define        SQL_BIND_INT(_s, _i, _v) \
        if (SQLITE_OK != sqlite3_bind_int \
                ((_s), (_i)++, (_v))) \
 #define        SQL_BIND_INT(_s, _i, _v) \
        if (SQLITE_OK != sqlite3_bind_int \
                ((_s), (_i)++, (_v))) \

-               fprintf(stderr, "%s\n", sqlite3_errmsg(db))
+               say(mlink->file, "%s", sqlite3_errmsg(db))

 #define        SQL_BIND_INT64(_s, _i, _v) \
        if (SQLITE_OK != sqlite3_bind_int64 \
                ((_s), (_i)++, (_v))) \
 #define        SQL_BIND_INT64(_s, _i, _v) \
        if (SQLITE_OK != sqlite3_bind_int64 \
                ((_s), (_i)++, (_v))) \

-               fprintf(stderr, "%s\n", sqlite3_errmsg(db))
+               say(mlink->file, "%s", sqlite3_errmsg(db))

 #define SQL_STEP(_s) \
        if (SQLITE_DONE != sqlite3_step((_s))) \
 #define SQL_STEP(_s) \
        if (SQLITE_DONE != sqlite3_step((_s))) \

-               fprintf(stderr, "%s\n", sqlite3_errmsg(db))
+               say(mlink->file, "%s", sqlite3_errmsg(db))

 
 enum   op {
        OP_DEFAULT = 0, /* new dbs from dir list or default config */
 
 enum   op {
        OP_DEFAULT = 0, /* new dbs from dir list or default config */


@@ -100,7 +100,7 @@ struct      inodev {
 
 struct mpage {
        struct inodev    inodev;  /* used for hashing routine */
 
 struct mpage {
        struct inodev    inodev;  /* used for hashing routine */

-       int64_t          recno;   /* id in mpages SQL table */
+       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 */
        enum form        form;    /* format from file content */
        char            *sec;     /* section from file content */
        char            *arch;    /* architecture from file content */


@@ -126,6 +126,7 @@ enum        stmt {
        STMT_DELETE_PAGE = 0,   /* delete mpage */
        STMT_INSERT_PAGE,       /* insert mpage */
        STMT_INSERT_LINK,       /* insert mlink */
        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
 };
        STMT_INSERT_KEY,        /* insert parsed key */
        STMT__MAX
 };


@@ -144,8 +145,8 @@ static      int      dbopen(int);
 static void     dbprune(void);
 static void     filescan(const char *);
 static void    *hash_alloc(size_t, void *);
 static void     dbprune(void);
 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 *);
+static void     hash_free(void *, void *);
+static void    *hash_calloc(size_t, size_t, 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     mlink_add(struct mlink *, const struct stat *);
 static void     mlink_check(struct mpage *, struct mlink *);
 static void     mlink_free(struct mlink *);


@@ -179,18 +180,20 @@ static    char             tempfilename[32];
 static char            *progname;
 static int              nodb; /* no database changes */
 static int              mparse_options; /* abort the parse early */
 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              debug; /* print what we're doing */
-static int              warnings; /* warn about crap */
+static int              use_all; /* use all found files */
+static int              debug; /* print what we're doing */
+static int              warnings; /* warn about crap */

 static int              write_utf8; /* write UTF-8 output; else ASCII */
 static int              exitcode; /* to be returned by main */
 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 enum op          op; /* operational mode */

 static char             basedir[PATH_MAX]; /* current base directory */
 static struct ohash     mpages; /* table of distinct manual pages */
 static struct ohash     mlinks; /* table of directory entries */
 static char             basedir[PATH_MAX]; /* current base directory */
 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 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] = {
        { NULL, 0 },  /* Ap */
 
 static const struct mdoc_handler mdocs[MDOC_MAX] = {
        { NULL, 0 },  /* Ap */


@@ -317,6 +320,7 @@ static      const struct mdoc_handler mdocs[MDOC_MAX] = {
        { NULL, 0 },  /* Ta */
 };
 
        { NULL, 0 },  /* Ta */
 };
 

+

 int
 main(int argc, char *argv[])
 {
 int
 main(int argc, char *argv[])
 {


@@ -332,8 +336,8 @@ main(int argc, char *argv[])
        memset(&dirs, 0, sizeof(struct manpaths));
 
        mpages_info.alloc  = mlinks_info.alloc  = hash_alloc;
        memset(&dirs, 0, sizeof(struct manpaths));
 
        mpages_info.alloc  = mlinks_info.alloc  = hash_alloc;

-       mpages_info.halloc = mlinks_info.halloc = hash_halloc;
-       mpages_info.hfree  = mlinks_info.hfree  = hash_free;
+       mpages_info.calloc = mlinks_info.calloc = hash_calloc;
+       mpages_info.free  = mlinks_info.free  = hash_free;

 
        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);


@@ -345,13 +349,14 @@ main(int argc, char *argv[])
                ++progname;
 
        /*
                ++progname;
 
        /*

-        * We accept a few different invocations.  
+        * We accept a few different invocations.

         * The CHECKOP macro makes sure that invocation styles don't
         * clobber each other.
         */
 #define        CHECKOP(_op, _ch) do \
        if (OP_DEFAULT != (_op)) { \
         * The CHECKOP macro makes sure that invocation styles don't
         * clobber each other.
         */
 #define        CHECKOP(_op, _ch) do \
        if (OP_DEFAULT != (_op)) { \

-               fprintf(stderr, "-%c: Conflicting option\n", (_ch)); \
+               fprintf(stderr, "%s: -%c: Conflicting option\n", \
+                   progname, (_ch)); \

                goto usage; \
        } while (/*CONSTCOND*/0)
 
                goto usage; \
        } while (/*CONSTCOND*/0)
 


@@ -360,51 +365,52 @@ main(int argc, char *argv[])
 
        while (-1 != (ch = getopt(argc, argv, "aC:Dd:npQT:tu:v")))
                switch (ch) {
 
        while (-1 != (ch = getopt(argc, argv, "aC:Dd:npQT:tu:v")))
                switch (ch) {

-               case ('a'):
+               case 'a':

                        use_all = 1;
                        break;
                        use_all = 1;
                        break;

-               case ('C'):
+               case 'C':

                        CHECKOP(op, ch);
                        path_arg = optarg;
                        op = OP_CONFFILE;
                        break;
                        CHECKOP(op, ch);
                        path_arg = optarg;
                        op = OP_CONFFILE;
                        break;

-               case ('D'):
+               case 'D':

                        debug++;
                        break;
                        debug++;
                        break;

-               case ('d'):
+               case 'd':

                        CHECKOP(op, ch);
                        path_arg = optarg;
                        op = OP_UPDATE;
                        break;
                        CHECKOP(op, ch);
                        path_arg = optarg;
                        op = OP_UPDATE;
                        break;

-               case ('n'):
+               case 'n':

                        nodb = 1;
                        break;
                        nodb = 1;
                        break;

-               case ('p'):
+               case 'p':

                        warnings = 1;
                        break;
                        warnings = 1;
                        break;

-               case ('Q'):
+               case 'Q':

                        mparse_options |= MPARSE_QUICK;
                        break;
                        mparse_options |= MPARSE_QUICK;
                        break;

-               case ('T'):
+               case 'T':

                        if (strcmp(optarg, "utf8")) {
                        if (strcmp(optarg, "utf8")) {

-                               fprintf(stderr, "-T%s: Unsupported "
-                                   "output format\n", optarg);
+                               fprintf(stderr, "%s: -T%s: "
+                                   "Unsupported output format\n",
+                                   progname, optarg);

                                goto usage;
                        }
                        write_utf8 = 1;
                        break;
                                goto usage;
                        }
                        write_utf8 = 1;
                        break;

-               case ('t'):
+               case 't':

                        CHECKOP(op, ch);
                        dup2(STDOUT_FILENO, STDERR_FILENO);
                        op = OP_TEST;
                        nodb = warnings = 1;
                        break;
                        CHECKOP(op, ch);
                        dup2(STDOUT_FILENO, STDERR_FILENO);
                        op = OP_TEST;
                        nodb = warnings = 1;
                        break;

-               case ('u'):
+               case 'u':

                        CHECKOP(op, ch);
                        path_arg = optarg;
                        op = OP_DELETE;
                        break;
                        CHECKOP(op, ch);
                        path_arg = optarg;
                        op = OP_DELETE;
                        break;

-               case ('v'):
+               case 'v':

                        /* Compatibility with espie@'s makewhatis. */
                        break;
                default:
                        /* Compatibility with espie@'s makewhatis. */
                        break;
                default:


@@ -415,7 +421,8 @@ main(int argc, char *argv[])
        argv += optind;
 
        if (OP_CONFFILE == op && argc > 0) {
        argv += optind;
 
        if (OP_CONFFILE == op && argc > 0) {

-               fprintf(stderr, "-C: Too many arguments\n");
+               fprintf(stderr, "%s: -C: Too many arguments\n",
+                   progname);

                goto usage;
        }
 
                goto usage;
        }
 


@@ -427,27 +434,39 @@ main(int argc, char *argv[])
        ohash_init(&mlinks, 6, &mlinks_info);
 
        if (OP_UPDATE == op || OP_DELETE == op || OP_TEST == op) {
        ohash_init(&mlinks, 6, &mlinks_info);
 
        if (OP_UPDATE == op || OP_DELETE == op || OP_TEST == op) {

-               /* 
-                * Force processing all files.
-                */
-               use_all = 1;

 
                /*
 
                /*

-                * All of these deal with a specific directory.
-                * Jump into that directory then collect files specified
-                * on the command-line.
+                * Most of these deal with a specific directory.
+                * Jump into that directory first.

                 */
                 */

-               if (0 == set_basedir(path_arg))
-                       goto out;
-               for (i = 0; i < argc; i++)
-                       filescan(argv[i]);
-               if (0 == dbopen(1))
+               if (OP_TEST != op && 0 == set_basedir(path_arg))

                        goto out;
                        goto out;

-               if (OP_TEST != op)
-                       dbprune();
+
+               if (dbopen(1)) {
+                       /*
+                        * The existing database is usable.  Process
+                        * all files specified on the command-line.
+                        */
+                       use_all = 1;
+                       for (i = 0; i < argc; i++)
+                               filescan(argv[i]);
+                       if (OP_TEST != op)
+                               dbprune();
+               } else {
+                       /*
+                        * Database missing or corrupt.
+                        * Recreate from scratch.
+                        */
+                       exitcode = (int)MANDOCLEVEL_OK;
+                       op = OP_DEFAULT;
+                       if (0 == treescan())
+                               goto out;
+                       if (0 == dbopen(0))
+                               goto out;
+               }

                if (OP_DELETE != op)
                        mpages_merge(mc, mp);
                if (OP_DELETE != op)
                        mpages_merge(mc, mp);

-               dbclose(1);
+               dbclose(OP_DEFAULT == op ? 0 : 1);

        } else {
                /*
                 * If we have arguments, use them as our manpaths.
        } else {
                /*
                 * If we have arguments, use them as our manpaths.


@@ -455,8 +474,8 @@ main(int argc, char *argv[])
                 * manpath_parse() wants to do it.
                 */
                if (argc > 0) {
                 * manpath_parse() wants to do it.
                 */
                if (argc > 0) {

-                       dirs.paths = mandoc_calloc
-                               (argc, sizeof(char *));
+                       dirs.paths = mandoc_reallocarray(NULL,
+                           argc, sizeof(char *));

                        dirs.sz = (size_t)argc;
                        for (i = 0; i < argc; i++)
                                dirs.paths[i] = mandoc_strdup(argv[i]);
                        dirs.sz = (size_t)argc;
                        for (i = 0; i < argc; i++)
                                dirs.paths[i] = mandoc_strdup(argv[i]);


@@ -490,13 +509,11 @@ main(int argc, char *argv[])
                                goto out;
                        if (0 == treescan())
                                goto out;
                                goto out;
                        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 (0 == dbopen(0))
                                goto out;
 
                        mpages_merge(mc, mp);

-                       if (warnings &&
+                       if (warnings && !nodb &&

                            ! (MPARSE_QUICK & mparse_options))
                                names_check();
                        dbclose(0);
                            ! (MPARSE_QUICK & mparse_options))
                                names_check();
                        dbclose(0);


@@ -509,7 +526,6 @@ main(int argc, char *argv[])
                }
        }
 out:
                }
        }
 out:

-       set_basedir(NULL);

        manpath_free(&dirs);
        mchars_free(mc);
        mparse_free(mp);
        manpath_free(&dirs);
        mchars_free(mc);
        mparse_free(mp);


@@ -523,7 +539,7 @@ usage:
                        "       %s [-DnpQ] [-Tutf8] -d dir [file ...]\n"
                        "       %s [-Dnp] -u dir [file ...]\n"
                        "       %s [-Q] -t file ...\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);
 
        return((int)MANDOCLEVEL_BADARG);
                       progname, progname);
 
        return((int)MANDOCLEVEL_BADARG);


@@ -537,7 +553,7 @@ usage:
  * If use_all has been specified, grok all files.
  * If not, sanitise paths to the following:
  *
  * If use_all has been specified, grok all files.
  * If not, sanitise paths to the following:
  *

- *   [./]man*[/<arch>]/<name>.<section> 
+ *   [./]man*[/<arch>]/<name>.<section>

  *   or
  *   [./]cat<section>[/<arch>]/<name>.0
  *
  *   or
  *   [./]cat<section>[/<arch>]/<name>.0
  *


@@ -546,6 +562,7 @@ usage:
 static int
 treescan(void)
 {
 static int
 treescan(void)
 {

+       char             buf[PATH_MAX];

        FTS             *f;
        FTSENT          *ff;
        struct mlink    *mlink;
        FTS             *f;
        FTSENT          *ff;
        struct mlink    *mlink;


@@ -557,11 +574,8 @@ treescan(void)
        argv[0] = ".";
        argv[1] = (char *)NULL;
 
        argv[0] = ".";
        argv[1] = (char *)NULL;
 

-       /*
-        * Walk through all components under the directory, using the
-        * logical descent of files.
-        */
-       f = fts_open((char * const *)argv, FTS_LOGICAL, NULL);
+       f = fts_open((char * const *)argv,
+           FTS_PHYSICAL | FTS_NOCHDIR, NULL);

        if (NULL == f) {
                exitcode = (int)MANDOCLEVEL_SYSERR;
                say("", "&fts_open");
        if (NULL == f) {
                exitcode = (int)MANDOCLEVEL_SYSERR;
                say("", "&fts_open");


@@ -573,11 +587,36 @@ treescan(void)
 
        while (NULL != (ff = fts_read(f))) {
                path = ff->fts_path + 2;
 
        while (NULL != (ff = fts_read(f))) {
                path = ff->fts_path + 2;

+               switch (ff->fts_info) {
+
+               /*
+                * Symbolic links require various sanity checks,
+                * then get handled just like regular files.
+                */
+               case FTS_SL:
+                       if (NULL == realpath(path, buf)) {
+                               if (warnings)
+                                       say(path, "&realpath");
+                               continue;
+                       }
+                       if (strstr(buf, basedir) != buf) {
+                               if (warnings) say("",
+                                   "%s: outside base directory", buf);
+                               continue;
+                       }
+                       /* Use logical inode to avoid mpages dupe. */
+                       if (-1 == stat(path, ff->fts_statp)) {
+                               if (warnings)
+                                       say(path, "&stat");
+                               continue;
+                       }
+                       /* FALLTHROUGH */
+

                /*
                 * If we're a regular file, add an mlink by using the
                 * stored directory data and handling the filename.
                 */
                /*
                 * If we're a regular file, add an mlink by using the
                 * stored directory data and handling the filename.
                 */

-               if (FTS_F == ff->fts_info) {
+               case FTS_F:

                        if (0 == strcmp(path, MANDOC_DB))
                                continue;
                        if ( ! use_all && ff->fts_level < 2) {
                        if (0 == strcmp(path, MANDOC_DB))
                                continue;
                        if ( ! use_all && ff->fts_level < 2) {


@@ -624,7 +663,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;


@@ -633,18 +678,23 @@ treescan(void)
                        mlink->gzip = gzip;
                        mlink_add(mlink, ff->fts_statp);
                        continue;
                        mlink->gzip = gzip;
                        mlink_add(mlink, ff->fts_statp);
                        continue;

-               } else if (FTS_D != ff->fts_info &&
-                               FTS_DP != ff->fts_info) {
+
+               case FTS_D:
+                       /* FALLTHROUGH */
+               case FTS_DP:
+                       break;
+
+               default:

                        if (warnings)
                                say(path, "Not a regular file");
                        continue;
                }
 
                switch (ff->fts_level) {
                        if (warnings)
                                say(path, "Not a regular file");
                        continue;
                }
 
                switch (ff->fts_level) {

-               case (0):
+               case 0:

                        /* Ignore the root directory. */
                        break;
                        /* Ignore the root directory. */
                        break;

-               case (1):
+               case 1:

                        /*
                         * This might contain manX/ or catX/.
                         * Try to infer this from the name.
                        /*
                         * This might contain manX/ or catX/.
                         * Try to infer this from the name.


@@ -665,14 +715,14 @@ treescan(void)
                                dsec = NULL;
                        }
 
                                dsec = NULL;
                        }
 

-                       if (NULL != dsec || use_all) 
+                       if (NULL != dsec || use_all)

                                break;
 
                        if (warnings)
                                say(path, "Unknown directory part");
                        fts_set(f, ff, FTS_SKIP);
                        break;
                                break;
 
                        if (warnings)
                                say(path, "Unknown directory part");
                        fts_set(f, ff, FTS_SKIP);
                        break;

-               case (2):
+               case 2:

                        /*
                         * Possibly our architecture.
                         * If we're descending, keep tabs on it.
                        /*
                         * Possibly our architecture.
                         * If we're descending, keep tabs on it.


@@ -704,7 +754,7 @@ treescan(void)
  * Try to infer the manual section, architecture, and page name from the
  * path, assuming it looks like
  *
  * Try to infer the manual section, architecture, and page name from the
  * path, assuming it looks like
  *

- *   [./]man*[/<arch>]/<name>.<section> 
+ *   [./]man*[/<arch>]/<name>.<section>

  *   or
  *   [./]cat<section>[/<arch>]/<name>.0
  *
  *   or
  *   [./]cat<section>[/<arch>]/<name>.0
  *


@@ -723,34 +773,73 @@ filescan(const char *file)
        if (0 == strncmp(file, "./", 2))
                file += 2;
 
        if (0 == strncmp(file, "./", 2))
                file += 2;
 

+       /*
+        * We have to do lstat(2) before realpath(3) loses
+        * the information whether this is a symbolic link.
+        * We need to know that because for symbolic links,
+        * we want to use the orginal file name, while for
+        * regular files, we want to use the real path.
+        */
+       if (-1 == lstat(file, &st)) {
+               exitcode = (int)MANDOCLEVEL_BADARG;
+               say(file, "&lstat");
+               return;
+       } else if (0 == ((S_IFREG | S_IFLNK) & st.st_mode)) {
+               exitcode = (int)MANDOCLEVEL_BADARG;
+               say(file, "Not a regular file");
+               return;
+       }
+
+       /*
+        * We have to resolve the file name to the real path
+        * in any case for the base directory check.
+        */

        if (NULL == realpath(file, buf)) {
                exitcode = (int)MANDOCLEVEL_BADARG;
                say(file, "&realpath");
                return;
        }
 
        if (NULL == realpath(file, buf)) {
                exitcode = (int)MANDOCLEVEL_BADARG;
                say(file, "&realpath");
                return;
        }
 

-       if (strstr(buf, basedir) == buf)
-               start = buf + strlen(basedir) + 1;
-       else if (OP_TEST == op)
+       if (OP_TEST == op)

                start = buf;
                start = buf;

+       else if (strstr(buf, basedir) == buf)
+               start = buf + strlen(basedir);

        else {
                exitcode = (int)MANDOCLEVEL_BADARG;
                say("", "%s: outside base directory", buf);
                return;
        }
 
        else {
                exitcode = (int)MANDOCLEVEL_BADARG;
                say("", "%s: outside base directory", buf);
                return;
        }
 

-       if (-1 == stat(buf, &st)) {
-               exitcode = (int)MANDOCLEVEL_BADARG;
-               say(file, "&stat");
-               return;
-       } else if ( ! (S_IFREG & st.st_mode)) {
-               exitcode = (int)MANDOCLEVEL_BADARG;
-               say(file, "Not a regular file");
-               return;
+       /*
+        * Now we are sure the file is inside our tree.
+        * If it is a symbolic link, ignore the real path
+        * and use the original name.
+        * This implies passing stuff like "cat1/../man1/foo.1"
+        * on the command line won't work.  So don't do that.
+        * Note the stat(2) can still fail if the link target
+        * doesn't exist.
+        */
+       if (S_IFLNK & st.st_mode) {
+               if (-1 == stat(buf, &st)) {
+                       exitcode = (int)MANDOCLEVEL_BADARG;
+                       say(file, "&stat");
+                       return;
+               }
+               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));
+       if (strlcpy(mlink->file, start, sizeof(mlink->file)) >=
+           sizeof(mlink->file)) {
+               say(start, "Filename too long");
+               return;
+       }

 
        /*
         * First try to guess our directory structure.
 
        /*
         * First try to guess our directory structure.


@@ -898,19 +987,15 @@ 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,
                if (NULL == ohash_find(&mlinks,

-                               ohash_qlookup(&mlinks, buf)))
+                   ohash_qlookup(&mlinks, buf)))

                        goto nextlink;
                if (warnings)
                        say(mlink->file, "Man source exists: %s", buf);
                        goto nextlink;
                if (warnings)
                        say(mlink->file, "Man source exists: %s", buf);


@@ -963,7 +1048,7 @@ mlink_check(struct mpage *mpage, struct mlink *mlink)
 
        /*
         * XXX
 
        /*
         * XXX

-        * parse_cat() doesn't set TYPE_Nm and TYPE_NAME yet.
+        * parse_cat() doesn't set NAME_TITLE yet.

         */
 
        if (FORM_CAT == mpage->form)
         */
 
        if (FORM_CAT == mpage->form)


@@ -974,10 +1059,10 @@ mlink_check(struct mpage *mpage, struct mlink *mlink)
         * appears as a name in the NAME section.
         */
 
         * appears as a name in the NAME section.
         */
 

-       slot = ohash_qlookup(&strings, mlink->name);
-       str = ohash_find(&strings, slot);
+       slot = ohash_qlookup(&names, mlink->name);
+       str = ohash_find(&names, slot);

        assert(NULL != str);
        assert(NULL != str);

-       if ( ! (TYPE_NAME & str->mask))
+       if ( ! (NAME_TITLE & str->mask))

                say(mlink->file, "Name missing in NAME section");
 }
 
                say(mlink->file, "Name missing in NAME section");
 }
 


@@ -1006,8 +1091,8 @@ mpages_merge(struct mchars *mc, struct mparse *mp)
        enum mandoclevel         lvl;
 
        str_info.alloc = hash_alloc;
        enum mandoclevel         lvl;
 
        str_info.alloc = hash_alloc;

-       str_info.halloc = hash_halloc;
-       str_info.hfree = hash_free;
+       str_info.calloc = hash_calloc;
+       str_info.free = hash_free;

        str_info.key_offset = offsetof(struct str, key);
 
        if (0 == nodb)
        str_info.key_offset = offsetof(struct str, key);
 
        if (0 == nodb)


@@ -1021,6 +1106,8 @@ mpages_merge(struct mchars *mc, struct mparse *mp)
                        continue;
                }
 
                        continue;
                }
 

+               name_mask = NAME_MASK;
+               ohash_init(&names, 4, &str_info);

                ohash_init(&strings, 6, &str_info);
                mparse_reset(mp);
                mdoc = NULL;
                ohash_init(&strings, 6, &str_info);
                mparse_reset(mp);
                mdoc = NULL;


@@ -1037,14 +1124,14 @@ mpages_merge(struct mchars *mc, struct mparse *mp)
                                goto nextpage;
                        }
                        switch (child_pid = fork()) {
                                goto nextpage;
                        }
                        switch (child_pid = fork()) {

-                       case (-1):
+                       case -1:

                                exitcode = (int)MANDOCLEVEL_SYSERR;
                                say(mpage->mlinks->file, "&fork gunzip");
                                child_pid = 0;
                                close(fd[1]);
                                close(fd[0]);
                                goto nextpage;
                                exitcode = (int)MANDOCLEVEL_SYSERR;
                                say(mpage->mlinks->file, "&fork gunzip");
                                child_pid = 0;
                                close(fd[1]);
                                close(fd[0]);
                                goto nextpage;

-                       case (0):
+                       case 0:

                                close(fd[0]);
                                if (-1 == dup2(fd[1], STDOUT_FILENO)) {
                                        say(mpage->mlinks->file,
                                close(fd[0]);
                                if (-1 == dup2(fd[1], STDOUT_FILENO)) {
                                        say(mpage->mlinks->file,


@@ -1094,7 +1181,7 @@ mpages_merge(struct mchars *mc, struct mparse *mp)
                                         * to the target.
                                         */
 
                                         * to the target.
                                         */
 

-                                       if (mpage_dest->recno)
+                                       if (mpage_dest->pageid)

                                                dbadd_mlink(mlink);
 
                                        if (NULL == mlink->next)
                                                dbadd_mlink(mlink);
 
                                        if (NULL == mlink->next)


@@ -1146,21 +1233,20 @@ mpages_merge(struct mchars *mc, struct mparse *mp)
                                putkey(mpage, mlink->fsec, TYPE_sec);
                        putkey(mpage, '\0' == *mlink->arch ?
                            any : mlink->arch, TYPE_arch);
                                putkey(mpage, mlink->fsec, TYPE_sec);
                        putkey(mpage, '\0' == *mlink->arch ?
                            any : mlink->arch, TYPE_arch);

-                       putkey(mpage, mlink->name, TYPE_Nm);
+                       putkey(mpage, mlink->name, NAME_FILE);

                }
 
                }
 

+               assert(NULL == mpage->desc);

                if (NULL != mdoc) {
                        if (NULL != (cp = mdoc_meta(mdoc)->name))
                if (NULL != mdoc) {
                        if (NULL != (cp = mdoc_meta(mdoc)->name))

-                               putkey(mpage, cp, TYPE_Nm);
-                       assert(NULL == mpage->desc);
+                               putkey(mpage, cp, NAME_HEAD);

                        parse_mdoc(mpage, mdoc_node(mdoc));
                        parse_mdoc(mpage, mdoc_node(mdoc));

-                       if (NULL == mpage->desc)
-                               mpage->desc = mandoc_strdup(
-                                   mpage->mlinks->name);

                } else if (NULL != man)
                        parse_man(mpage, man_node(man));
                else
                        parse_cat(mpage, fd[0]);
                } else if (NULL != man)
                        parse_man(mpage, man_node(man));
                else
                        parse_cat(mpage, fd[0]);

+               if (NULL == mpage->desc)
+                       mpage->desc = mandoc_strdup(mpage->mlinks->name);

 
                if (warnings && !use_all)
                        for (mlink = mpage->mlinks; mlink;
 
                if (warnings && !use_all)
                        for (mlink = mpage->mlinks; mlink;


@@ -1187,6 +1273,7 @@ nextpage:
                        }
                }
                ohash_delete(&strings);
                        }
                }
                ohash_delete(&strings);

+               ohash_delete(&names);

                mpage = ohash_next(&mpages, &pslot);
        }
 
                mpage = ohash_next(&mpages, &pslot);
        }
 


@@ -1199,24 +1286,24 @@ names_check(void)
 {
        sqlite3_stmt    *stmt;
        const char      *name, *sec, *arch, *key;
 {
        sqlite3_stmt    *stmt;
        const char      *name, *sec, *arch, *key;

-       size_t           i;

        int              irc;
 
        sqlite3_prepare_v2(db,
          "SELECT name, sec, arch, key FROM ("
        int              irc;
 
        sqlite3_prepare_v2(db,
          "SELECT name, sec, arch, key FROM ("

-           "SELECT key, pageid FROM keys "
+           "SELECT name AS key, pageid FROM names "

            "WHERE bits & ? AND NOT EXISTS ("
              "SELECT pageid FROM mlinks "
            "WHERE bits & ? AND NOT EXISTS ("
              "SELECT pageid FROM mlinks "

-             "WHERE mlinks.pageid == keys.pageid "
-             "AND mlinks.name == keys.key"
+             "WHERE mlinks.pageid == names.pageid "
+             "AND mlinks.name == names.name"

            ")"
          ") JOIN ("
            ")"
          ") JOIN ("

-           "SELECT * FROM mlinks GROUP BY pageid"
+           "SELECT sec, arch, name, pageid FROM mlinks "
+           "GROUP BY pageid"

          ") USING (pageid);",
          -1, &stmt, NULL);
 
          ") USING (pageid);",
          -1, &stmt, NULL);
 

-       i = 1;
-       SQL_BIND_INT64(stmt, i, TYPE_NAME);
+       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);
 
        while (SQLITE_ROW == (irc = sqlite3_step(stmt))) {
                name = sqlite3_column_text(stmt, 0);


@@ -1260,7 +1347,7 @@ parse_cat(struct mpage *mpage, int fd)
        while (NULL != (line = fgetln(stream, &len)))
                if ('\n' != *line && ' ' != *line)
                        break;
        while (NULL != (line = fgetln(stream, &len)))
                if ('\n' != *line && ' ' != *line)
                        break;

-       
+

        /*
         * Read up until the next section into a buffer.
         * Strip the leading and trailing newline from each read line,
        /*
         * Read up until the next section into a buffer.
         * Strip the leading and trailing newline from each read line,


@@ -1297,8 +1384,6 @@ parse_cat(struct mpage *mpage, int fd)
                if (warnings)
                        say(mpage->mlinks->file,
                            "Cannot find NAME section");
                if (warnings)
                        say(mpage->mlinks->file,
                            "Cannot find NAME section");

-               assert(NULL == mpage->desc);
-               mpage->desc = mandoc_strdup(mpage->mlinks->name);

                fclose(stream);
                free(title);
                return;
                fclose(stream);
                free(title);
                return;


@@ -1332,12 +1417,11 @@ parse_cat(struct mpage *mpage, int fd)
                if (0 == len) {
                        memmove(line, line + 1, plen--);
                        continue;
                if (0 == len) {
                        memmove(line, line + 1, plen--);
                        continue;

-               } 
+               }

                memmove(line - 1, line + 1, plen - len);
                plen -= 2;
        }
 
                memmove(line - 1, line + 1, plen - len);
                plen -= 2;
        }
 

-       assert(NULL == mpage->desc);

        mpage->desc = mandoc_strdup(p);
        fclose(stream);
        free(title);
        mpage->desc = mandoc_strdup(p);
        fclose(stream);
        free(title);


@@ -1397,11 +1481,11 @@ parse_man(struct mpage *mpage, const struct man_node *n)
                body = n;
                assert(body->parent);
                if (NULL != (head = body->parent->head) &&
                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) {
+                   1 == head->nchild &&
+                   NULL != (head = (head->child)) &&
+                   MAN_TEXT == head->type &&
+                   0 == strcmp(head->string, "NAME") &&
+                   NULL != body->child) {

 
                        /*
                         * Suck the entire NAME section into memory.
 
                        /*
                         * Suck the entire NAME section into memory.


@@ -1415,7 +1499,7 @@ parse_man(struct mpage *mpage, const struct man_node *n)
                        if (NULL == title)
                                return;
 
                        if (NULL == title)
                                return;
 

-                       /* 
+                       /*

                         * Go through a special heuristic dance here.
                         * Conventionally, one or more manual names are
                         * comma-specified prior to a whitespace, then a
                         * Go through a special heuristic dance here.
                         * Conventionally, one or more manual names are
                         * comma-specified prior to a whitespace, then a


@@ -1441,7 +1525,7 @@ parse_man(struct mpage *mpage, const struct man_node *n)
                                    ('\\' == start[0] && '-' == start[1]))
                                        break;
 
                                    ('\\' == start[0] && '-' == start[1]))
                                        break;
 

-                               putkey(mpage, start, TYPE_NAME | TYPE_Nm);
+                               putkey(mpage, start, NAME_TITLE);

 
                                if (' ' == byte) {
                                        start += sz + 1;
 
                                if (' ' == byte) {
                                        start += sz + 1;


@@ -1455,7 +1539,7 @@ parse_man(struct mpage *mpage, const struct man_node *n)
                        }
 
                        if (start == title) {
                        }
 
                        if (start == title) {

-                               putkey(mpage, start, TYPE_NAME | TYPE_Nm);
+                               putkey(mpage, start, NAME_TITLE);

                                free(title);
                                return;
                        }
                                free(title);
                                return;
                        }


@@ -1477,7 +1561,6 @@ parse_man(struct mpage *mpage, const struct man_node *n)
                        while (' ' == *start)
                                start++;
 
                        while (' ' == *start)
                                start++;
 

-                       assert(NULL == mpage->desc);

                        mpage->desc = mandoc_strdup(start);
                        free(title);
                        return;
                        mpage->desc = mandoc_strdup(start);
                        free(title);
                        return;


@@ -1498,15 +1581,15 @@ parse_mdoc(struct mpage *mpage, const struct mdoc_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 MDOC_ELEM:

                        /* FALLTHROUGH */
                        /* FALLTHROUGH */

-               case (MDOC_BLOCK):
+               case MDOC_BLOCK:

                        /* FALLTHROUGH */
                        /* FALLTHROUGH */

-               case (MDOC_HEAD):
+               case MDOC_HEAD:

                        /* FALLTHROUGH */
                        /* FALLTHROUGH */

-               case (MDOC_BODY):
+               case MDOC_BODY:

                        /* FALLTHROUGH */
                        /* FALLTHROUGH */

-               case (MDOC_TAIL):
+               case MDOC_TAIL:

                        if (NULL != mdocs[n->tok].fp)
                               if (0 == (*mdocs[n->tok].fp)(mpage, n))
                                       break;
                        if (NULL != mdocs[n->tok].fp)
                               if (0 == (*mdocs[n->tok].fp)(mpage, n))
                                       break;


@@ -1530,8 +1613,8 @@ parse_mdoc_Fd(struct mpage *mpage, const struct mdoc_node *n)
        size_t           sz;
 
        if (SEC_SYNOPSIS != n->sec ||
        size_t           sz;
 
        if (SEC_SYNOPSIS != n->sec ||

-                       NULL == (n = n->child) || 
-                       MDOC_TEXT != n->type)
+           NULL == (n = n->child) ||
+           MDOC_TEXT != n->type)

                return(0);
 
        /*
                return(0);
 
        /*


@@ -1574,11 +1657,11 @@ parse_mdoc_Fn(struct mpage *mpage, const struct mdoc_node *n)
        if (NULL == (n = n->child) || MDOC_TEXT != n->type)
                return(0);
 
        if (NULL == (n = n->child) || MDOC_TEXT != n->type)
                return(0);
 

-       /* 
+       /*

         * Parse: .Fn "struct type *name" "char *arg".
         * Parse: .Fn "struct type *name" "char *arg".

-        * First strip away pointer symbol. 
+        * First strip away pointer symbol.

         * Then store the function name, then type.
         * Then store the function name, then type.

-        * Finally, store the arguments. 
+        * Finally, store the arguments.

         */
 
        if (NULL == (cp = strrchr(n->string, ' ')))
         */
 
        if (NULL == (cp = strrchr(n->string, ' ')))


@@ -1632,9 +1715,9 @@ parse_mdoc_Nm(struct mpage *mpage, const struct mdoc_node *n)
 {
 
        if (SEC_NAME == n->sec)
 {
 
        if (SEC_NAME == n->sec)

-               putmdockey(mpage, n->child, TYPE_NAME | TYPE_Nm);
+               putmdockey(mpage, n->child, NAME_TITLE);

        else if (SEC_SYNOPSIS == n->sec && MDOC_HEAD == n->type)
        else if (SEC_SYNOPSIS == n->sec && MDOC_HEAD == n->type)

-               putmdockey(mpage, n->child, TYPE_Nm);
+               putmdockey(mpage, n->child, NAME_SYN);

        return(0);
 }
 
        return(0);
 }
 


@@ -1668,36 +1751,43 @@ static void
 putkeys(const struct mpage *mpage,
        const char *cp, size_t sz, uint64_t v)
 {
 putkeys(const struct mpage *mpage,
        const char *cp, size_t sz, uint64_t v)
 {

+       struct ohash    *htab;

        struct str      *s;
        const char      *end;
        struct str      *s;
        const char      *end;

-       uint64_t         mask;

        unsigned int     slot;
        int              i;
 
        if (0 == sz)
                return;
 
        unsigned int     slot;
        int              i;
 
        if (0 == sz)
                return;
 

-       if (debug > 1) {
-               for (i = 0, mask = 1;
-                    i < mansearch_keymax;
-                    i++, mask <<= 1)
-                       if (mask & v)
-                               break;
-               say(mpage->mlinks->file, "Adding key %s=%*s",
-                   mansearch_keynames[i], sz, cp);
+       if (TYPE_Nm & v) {
+               htab = &names;
+               v &= name_mask;
+               name_mask &= ~NAME_FIRST;
+               if (debug > 1)
+                       say(mpage->mlinks->file,
+                           "Adding name %*s", sz, cp);
+       } else {
+               htab = &strings;
+               if (debug > 1)
+                   for (i = 0; i < mansearch_keymax; i++)
+                       if (1 << i & v)
+                           say(mpage->mlinks->file,
+                               "Adding key %s=%*s",
+                               mansearch_keynames[i], sz, cp);

        }
 
        end = cp + sz;
        }
 
        end = cp + sz;

-       slot = ohash_qlookupi(&strings, cp, &end);
-       s = ohash_find(&strings, slot);
+       slot = ohash_qlookupi(htab, cp, &end);
+       s = ohash_find(htab, slot);

 
        if (NULL != s && mpage == s->mpage) {
                s->mask |= v;
                return;
        } else if (NULL == s) {
 
        if (NULL != s && mpage == s->mpage) {
                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);
                memcpy(s->key, cp, sz);

-               ohash_insert(&strings, slot, s);
+               ohash_insert(htab, slot, s);

        }
        s->mpage = mpage;
        s->mask = v;
        }
        s->mpage = mpage;
        s->mask = v;


@@ -1788,7 +1878,7 @@ render_key(struct mchars *mc, struct str *key)
        if (strcspn(val, res) == bsz) {
                key->rendered = key->key;
                return;
        if (strcspn(val, res) == bsz) {
                key->rendered = key->key;
                return;

-       } 
+       }

 
        /* Pre-allocate by the length of the input */
 
 
        /* Pre-allocate by the length of the input */
 


@@ -1808,17 +1898,17 @@ render_key(struct mchars *mc, struct str *key)
                }
 
                switch (*val) {
                }
 
                switch (*val) {

-               case (ASCII_HYPH):
+               case ASCII_HYPH:

                        buf[pos++] = '-';
                        val++;
                        continue;
                        buf[pos++] = '-';
                        val++;
                        continue;

-               case ('\t'):
+               case '\t':

                        /* FALLTHROUGH */
                        /* FALLTHROUGH */

-               case (ASCII_NBRSP):
+               case ASCII_NBRSP:

                        buf[pos++] = ' ';
                        val++;
                        /* FALLTHROUGH */
                        buf[pos++] = ' ';
                        val++;
                        /* FALLTHROUGH */

-               case (ASCII_BREAK):
+               case ASCII_BREAK:

                        continue;
                default:
                        break;
                        continue;
                default:
                        break;


@@ -1835,8 +1925,8 @@ render_key(struct mchars *mc, struct str *key)
                 * predefined character or special character.
                 */
 
                 * predefined character or special character.
                 */
 

-               esc = mandoc_escape
-                       ((const char **)&val, &seq, &len);
+               esc = mandoc_escape((const char **)&val,
+                   &seq, &len);

                if (ESCAPE_ERROR == esc)
                        break;
                if (ESCAPE_SPECIAL != esc)
                if (ESCAPE_ERROR == esc)
                        break;
                if (ESCAPE_SPECIAL != esc)


@@ -1885,7 +1975,7 @@ dbadd_mlink(const struct mlink *mlink)
        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_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->recno);
+       SQL_BIND_INT64(stmts[STMT_INSERT_LINK], i, mlink->mpage->pageid);

        SQL_STEP(stmts[STMT_INSERT_LINK]);
        sqlite3_reset(stmts[STMT_INSERT_LINK]);
 }
        SQL_STEP(stmts[STMT_INSERT_LINK]);
        sqlite3_reset(stmts[STMT_INSERT_LINK]);
 }


@@ -1907,6 +1997,20 @@ dbadd(struct mpage *mpage, struct mchars *mc)
        mlink = mpage->mlinks;
 
        if (nodb) {
        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);
+                       free(key);
+               }
+               for (key = ohash_first(&strings, &slot); NULL != key;
+                    key = ohash_next(&strings, &slot)) {
+                       if (key->rendered != key->key)
+                               free(key->rendered);
+                       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 ||


@@ -1933,18 +2037,43 @@ 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);
+

        i = 1;
        i = 1;

-       SQL_BIND_TEXT(stmts[STMT_INSERT_PAGE], i, mpage->desc);
+       SQL_BIND_TEXT(stmts[STMT_INSERT_PAGE], i, key->rendered);

        SQL_BIND_INT(stmts[STMT_INSERT_PAGE], i, FORM_SRC == mpage->form);
        SQL_STEP(stmts[STMT_INSERT_PAGE]);
        SQL_BIND_INT(stmts[STMT_INSERT_PAGE], i, FORM_SRC == mpage->form);
        SQL_STEP(stmts[STMT_INSERT_PAGE]);

-       mpage->recno = sqlite3_last_insert_rowid(db);
+       mpage->pageid = sqlite3_last_insert_rowid(db);

        sqlite3_reset(stmts[STMT_INSERT_PAGE]);
 
        sqlite3_reset(stmts[STMT_INSERT_PAGE]);
 

+       if (key->rendered != key->key)
+               free(key->rendered);
+       free(key);
+

        while (NULL != mlink) {
                dbadd_mlink(mlink);
                mlink = mlink->next;
        }
        while (NULL != mlink) {
                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);
+               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);
+               free(key);
+       }

        for (key = ohash_first(&strings, &slot); NULL != key;
             key = ohash_next(&strings, &slot)) {
                assert(key->mpage == mpage);
        for (key = ohash_first(&strings, &slot); NULL != key;
             key = ohash_next(&strings, &slot)) {
                assert(key->mpage == mpage);


@@ -1953,7 +2082,7 @@ dbadd(struct mpage *mpage, struct mchars *mc)
                i = 1;
                SQL_BIND_INT64(stmts[STMT_INSERT_KEY], i, key->mask);
                SQL_BIND_TEXT(stmts[STMT_INSERT_KEY], i, key->rendered);
                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->recno);
+               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)
                SQL_STEP(stmts[STMT_INSERT_KEY]);
                sqlite3_reset(stmts[STMT_INSERT_KEY]);
                if (key->rendered != key->key)


@@ -2031,11 +2160,11 @@ dbclose(int real)
        }
 
        switch (child = fork()) {
        }
 
        switch (child = fork()) {

-       case (-1):
+       case -1:

                exitcode = (int)MANDOCLEVEL_SYSERR;
                say("", "&fork cmp");
                return;
                exitcode = (int)MANDOCLEVEL_SYSERR;
                say("", "&fork cmp");
                return;

-       case (0):
+       case 0:

                execlp("cmp", "cmp", "-s",
                    tempfilename, MANDOC_DB, NULL);
                say("", "&exec cmp");
                execlp("cmp", "cmp", "-s",
                    tempfilename, MANDOC_DB, NULL);
                say("", "&exec cmp");


@@ -2057,11 +2186,11 @@ dbclose(int real)
 
        *strrchr(tempfilename, '/') = '\0';
        switch (child = fork()) {
 
        *strrchr(tempfilename, '/') = '\0';
        switch (child = fork()) {

-       case (-1):
+       case -1:

                exitcode = (int)MANDOCLEVEL_SYSERR;
                say("", "&fork rm");
                return;
                exitcode = (int)MANDOCLEVEL_SYSERR;
                say("", "&fork rm");
                return;

-       case (0):
+       case 0:

                execlp("rm", "rm", "-rf", tempfilename, NULL);
                say("", "&exec rm");
                exit((int)MANDOCLEVEL_SYSERR);
                execlp("rm", "rm", "-rf", tempfilename, NULL);
                say("", "&exec rm");
                exit((int)MANDOCLEVEL_SYSERR);


@@ -2092,7 +2221,7 @@ dbopen(int real)
        const char      *sql;
        int              rc, ofl;
 
        const char      *sql;
        int              rc, ofl;
 

-       if (nodb) 
+       if (nodb)

                return(1);
 
        *tempfilename = '\0';
                return(1);
 
        *tempfilename = '\0';


@@ -2102,7 +2231,8 @@ dbopen(int real)
                rc = sqlite3_open_v2(MANDOC_DB, &db, ofl, NULL);
                if (SQLITE_OK != rc) {
                        exitcode = (int)MANDOCLEVEL_SYSERR;
                rc = sqlite3_open_v2(MANDOC_DB, &db, ofl, NULL);
                if (SQLITE_OK != rc) {
                        exitcode = (int)MANDOCLEVEL_SYSERR;

-                       say(MANDOC_DB, "%s", sqlite3_errmsg(db));
+                       if (SQLITE_CANTOPEN != rc)
+                               say(MANDOC_DB, "%s", sqlite3_errstr(rc));

                        return(0);
                }
                goto prepare_statements;
                        return(0);
                }
                goto prepare_statements;


@@ -2112,36 +2242,27 @@ dbopen(int real)
 
        remove(MANDOC_DB "~");
        rc = sqlite3_open_v2(MANDOC_DB "~", &db, ofl, NULL);
 
        remove(MANDOC_DB "~");
        rc = sqlite3_open_v2(MANDOC_DB "~", &db, ofl, NULL);

-       if (SQLITE_OK == rc) 
+       if (SQLITE_OK == rc)

                goto create_tables;
        if (MPARSE_QUICK & mparse_options) {
                exitcode = (int)MANDOCLEVEL_SYSERR;
                goto create_tables;
        if (MPARSE_QUICK & mparse_options) {
                exitcode = (int)MANDOCLEVEL_SYSERR;

-               say(MANDOC_DB "~", "%s", sqlite3_errmsg(db));
+               say(MANDOC_DB "~", "%s", sqlite3_errstr(rc));

                return(0);
        }
 
                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);
-       }
+       (void)strlcpy(tempfilename, "/tmp/mandocdb.XXXXXX",
+           sizeof(tempfilename));

        if (NULL == mkdtemp(tempfilename)) {
                exitcode = (int)MANDOCLEVEL_SYSERR;
                say("", "&%s", tempfilename);
                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);
-       }
+       (void)strlcat(tempfilename, "/" MANDOC_DB,
+           sizeof(tempfilename));

        rc = sqlite3_open_v2(tempfilename, &db, ofl, NULL);
        if (SQLITE_OK != rc) {
                exitcode = (int)MANDOCLEVEL_SYSERR;
        rc = sqlite3_open_v2(tempfilename, &db, ofl, NULL);
        if (SQLITE_OK != rc) {
                exitcode = (int)MANDOCLEVEL_SYSERR;

-               say("", "%s: %s", tempfilename, sqlite3_errmsg(db));
+               say("", "%s: %s", tempfilename, sqlite3_errstr(rc));

                return(0);
        }
 
                return(0);
        }
 


@@ -2149,33 +2270,51 @@ create_tables:
        sql = "CREATE TABLE \"mpages\" (\n"
              " \"desc\" TEXT NOT NULL,\n"
              " \"form\" INTEGER NOT NULL,\n"
        sql = "CREATE TABLE \"mpages\" (\n"
              " \"desc\" TEXT NOT NULL,\n"
              " \"form\" INTEGER NOT NULL,\n"

-             " \"id\" INTEGER PRIMARY KEY AUTOINCREMENT 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"
              ");\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(id) "
+             " \"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"
                "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(id) "
+             " \"pageid\" INTEGER NOT NULL REFERENCES mpages(pageid) "

                "ON DELETE CASCADE\n"
                "ON DELETE CASCADE\n"

-             ");\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));
 
        if (SQLITE_OK != sqlite3_exec(db, sql, NULL, NULL, NULL)) {
                exitcode = (int)MANDOCLEVEL_SYSERR;
                say(MANDOC_DB, "%s", sqlite3_errmsg(db));

+               sqlite3_close(db);

                return(0);
        }
 
 prepare_statements:
                return(0);
        }
 
 prepare_statements:

-       SQL_EXEC("PRAGMA foreign_keys = ON");
-       sql = "DELETE FROM mpages WHERE id IN "
+       if (SQLITE_OK != sqlite3_exec(db,
+           "PRAGMA foreign_keys = ON", NULL, NULL, NULL)) {
+               exitcode = (int)MANDOCLEVEL_SYSERR;
+               say(MANDOC_DB, "PRAGMA foreign_keys: %s",
+                   sqlite3_errmsg(db));
+               sqlite3_close(db);
+               return(0);
+       }
+
+       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);
                "(SELECT pageid FROM mlinks WHERE "
                "sec=? AND arch=? AND name=?)";
        sqlite3_prepare_v2(db, sql, -1, &stmts[STMT_DELETE_PAGE], NULL);


@@ -2185,6 +2324,9 @@ 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 = "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);
        sql = "INSERT INTO keys "
                "(bits,key,pageid) VALUES (?,?,?)";
        sqlite3_prepare_v2(db, sql, -1, &stmts[STMT_INSERT_KEY], NULL);


@@ -2195,18 +2337,24 @@ prepare_statements:
         * synchronous mode for much better performance.
         */
 
         * synchronous mode for much better performance.
         */
 

-       if (real)
-               SQL_EXEC("PRAGMA synchronous = OFF");
+       if (real && SQLITE_OK != sqlite3_exec(db,
+           "PRAGMA synchronous = OFF", NULL, NULL, NULL)) {
+               exitcode = (int)MANDOCLEVEL_SYSERR;
+               say(MANDOC_DB, "PRAGMA synchronous: %s",
+               sqlite3_errmsg(db));
+               sqlite3_close(db);
+               return(0);
+       }

 #endif
 
        return(1);
 }
 
 static void *
 #endif
 
        return(1);
 }
 
 static void *

-hash_halloc(size_t sz, void *arg)
+hash_calloc(size_t n, size_t sz, void *arg)

 {
 
 {
 

-       return(mandoc_calloc(sz, 1));
+       return(mandoc_calloc(n, sz));

 }
 
 static void *
 }
 
 static void *


@@ -2217,7 +2365,7 @@ hash_alloc(size_t sz, void *arg)
 }
 
 static void
 }
 
 static void

-hash_free(void *p, size_t sz, void *arg)
+hash_free(void *p, void *arg)

 {
 
        free(p);
 {
 
        free(p);


@@ -2227,45 +2375,56 @@ static int
 set_basedir(const char *targetdir)
 {
        static char      startdir[PATH_MAX];
 set_basedir(const char *targetdir)
 {
        static char      startdir[PATH_MAX];

-       static int       fd;
+       static int       getcwd_status;  /* 1 = ok, 2 = failure */
+       static int       chdir_status;  /* 1 = changed directory */
+       char            *cp;

 
        /*
 
        /*

-        * 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.
+        * 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' == *startdir) {
-               if (NULL == getcwd(startdir, PATH_MAX)) {
-                       exitcode = (int)MANDOCLEVEL_SYSERR;
-                       if (NULL != targetdir)
-                               say("", "&getcwd");
-                       return(0);
-               }
-               if (-1 == (fd = open(startdir, O_RDONLY, 0))) {
+       if (0 == getcwd_status) {
+               if (NULL == getcwd(startdir, sizeof(startdir))) {
+                       getcwd_status = 2;
+                       (void)strlcpy(startdir, strerror(errno),
+                           sizeof(startdir));
+               } else
+                       getcwd_status = 1;
+       }
+
+       /*
+        * We are leaving the old base directory.
+        * Do not use it any longer, not even for messages.
+        */
+       *basedir = '\0';
+
+       /*
+        * 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 (chdir_status && '/' != *targetdir) {
+               if (2 == getcwd_status) {

                        exitcode = (int)MANDOCLEVEL_SYSERR;
                        exitcode = (int)MANDOCLEVEL_SYSERR;

-                       say("", "&open %s", startdir);
+                       say("", "getcwd: %s", startdir);

                        return(0);
                }
                        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);
                        return(0);
                }
                        exitcode = (int)MANDOCLEVEL_SYSERR;
                        say("", "&chdir %s", startdir);
                        return(0);
                }

-               if (NULL == targetdir) {
-                       close(fd);
-                       return(1);
-               }

        }
        }

+
+       /*
+        * 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);
                exitcode = (int)MANDOCLEVEL_BADARG;
                say("", "&%s: realpath", targetdir);
                return(0);


@@ -2274,6 +2433,17 @@ set_basedir(const char *targetdir)
                say("", "&chdir");
                return(0);
        }
                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);
 }
 


@@ -2286,17 +2456,17 @@ 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);
 
        use_errno = 1;
        if (NULL != format) {
                switch (*format) {
        if ('\0' != *file)
                fprintf(stderr, "%s", file);
 
        use_errno = 1;
        if (NULL != format) {
                switch (*format) {

-               case ('&'):
+               case '&':

                        format++;
                        break;
                        format++;
                        break;

-               case ('\0'):
+               case '\0':

                        format = NULL;
                        break;
                default:
                        format = NULL;
                        break;
                default: