Small tweaks for release.

[mandoc.git] / mandocdb.c

diff --git a/mandocdb.c b/mandocdb.c
index 04495315e2c4da7b67c31824f36e6698a5af86b5..e621c1d2a21138fa8c8fbb6736030af14c4099b0 100644 (file)
--- a/mandocdb.c
+++ b/mandocdb.c
@@ -1,4 +1,4 @@
-/*     $Id: mandocdb.c,v 1.40 2011/12/25 16:53:51 schwarze Exp $ */
+/*     $Id: mandocdb.c,v 1.46 2012/03/23 06:52:17 kristaps Exp $ */

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


@@ -23,7 +23,9 @@
 #include <sys/types.h>
 
 #include <assert.h>
 #include <sys/types.h>
 
 #include <assert.h>

+#include <ctype.h>

 #include <dirent.h>
 #include <dirent.h>

+#include <errno.h>

 #include <fcntl.h>
 #include <getopt.h>
 #include <stdio.h>
 #include <fcntl.h>
 #include <getopt.h>
 #include <stdio.h>


@@ -54,6 +56,15 @@
 #define        MANDOC_SRC        0x1
 #define        MANDOC_FORM       0x2
 
 #define        MANDOC_SRC        0x1
 #define        MANDOC_FORM       0x2
 

+#define WARNING(_f, _b, _fmt, _args...) \
+       do if (warnings) { \
+               fprintf(stderr, "%s: ", (_b)); \
+               fprintf(stderr, (_fmt), ##_args); \
+               if ('\0' != *(_f)) \
+                       fprintf(stderr, ": %s", (_f)); \
+               fprintf(stderr, "\n"); \
+       } while (/* CONSTCOND */ 0)
+               

 /* Access to the mandoc database on disk. */
 
 struct mdb {
 /* Access to the mandoc database on disk. */
 
 struct mdb {


@@ -122,15 +133,17 @@ static    void              hash_put(DB *, const struct buf *, uint64_t);
 static void              hash_reset(DB **);
 static void              index_merge(const struct of *, struct mparse *,
                                struct buf *, struct buf *, DB *,
 static void              hash_reset(DB **);
 static void              index_merge(const struct of *, struct mparse *,
                                struct buf *, struct buf *, DB *,

-                               struct mdb *, struct recs *);
+                               struct mdb *, struct recs *,
+                               const char *);

 static void              index_prune(const struct of *, struct mdb *,
 static void              index_prune(const struct of *, struct mdb *,

-                               struct recs *);
-static void              ofile_argbuild(int, char *[], struct of **);
+                               struct recs *, const char *);
+static void              ofile_argbuild(int, char *[], 
+                               struct of **, const char *);

 static void              ofile_dirbuild(const char *, const char *,
 static void              ofile_dirbuild(const char *, const char *,

-                               const char *, int, struct of **);
+                               const char *, int, struct of **, char *);

 static void              ofile_free(struct of *);
 static void              ofile_free(struct of *);

-static void              pformatted(DB *, struct buf *, struct buf *,
-                               const struct of *);
+static void              pformatted(DB *, struct buf *, struct buf *, 
+                               const struct of *, const char *);

 static int               pman_node(MAN_ARGS);
 static void              pmdoc_node(MDOC_ARGS);
 static int               pmdoc_head(MDOC_ARGS);
 static int               pman_node(MAN_ARGS);
 static void              pmdoc_node(MDOC_ARGS);
 static int               pmdoc_head(MDOC_ARGS);


@@ -291,9 +304,8 @@ main(int argc, char *argv[])
        struct recs      recs;
        enum op          op; /* current operation */
        const char      *dir;
        struct recs      recs;
        enum op          op; /* current operation */
        const char      *dir;

-       char            *cp;
-       char             pbuf[PATH_MAX];

        int              ch, i, flags;
        int              ch, i, flags;

+       char             dirbuf[MAXPATHLEN];

        DB              *hash; /* temporary keyword hashtable */
        BTREEINFO        info; /* btree configuration */
        size_t           sz1, sz2;
        DB              *hash; /* temporary keyword hashtable */
        BTREEINFO        info; /* btree configuration */
        size_t           sz1, sz2;


@@ -381,6 +393,7 @@ main(int argc, char *argv[])
        }
 
        memset(&info, 0, sizeof(BTREEINFO));
        }
 
        memset(&info, 0, sizeof(BTREEINFO));

+       info.lorder = 4321;

        info.flags = R_DUP;
 
        mp = mparse_alloc(MPARSE_AUTO, MANDOCLEVEL_FATAL, NULL, NULL);
        info.flags = R_DUP;
 
        mp = mparse_alloc(MPARSE_AUTO, MANDOCLEVEL_FATAL, NULL, NULL);


@@ -393,15 +406,12 @@ main(int argc, char *argv[])
        buf.cp = mandoc_malloc(buf.size);
        dbuf.cp = mandoc_malloc(dbuf.size);
 
        buf.cp = mandoc_malloc(buf.size);
        dbuf.cp = mandoc_malloc(dbuf.size);
 

-       flags = O_CREAT | O_RDWR;
-       if (OP_DEFAULT == op || OP_CONFFILE == op)
-               flags |= O_TRUNC;
-

        if (OP_TEST == op) {
        if (OP_TEST == op) {

-               ofile_argbuild(argc, argv, &of);
+               ofile_argbuild(argc, argv, &of, ".");

                if (NULL == of)
                        goto out;
                if (NULL == of)
                        goto out;

-               index_merge(of, mp, &dbuf, &buf, hash, &mdb, &recs);
+               index_merge(of, mp, &dbuf, &buf, 
+                               hash, &mdb, &recs, ".");

                goto out;
        }
 
                goto out;
        }
 


@@ -419,6 +429,7 @@ main(int argc, char *argv[])
                        exit((int)MANDOCLEVEL_BADARG);
                }
 
                        exit((int)MANDOCLEVEL_BADARG);
                }
 

+               flags = O_CREAT | O_RDWR;

                mdb.db = dbopen(mdb.dbn, flags, 0644, DB_BTREE, &info);
                mdb.idx = dbopen(mdb.idxn, flags, 0644, DB_RECNO, NULL);
 
                mdb.db = dbopen(mdb.dbn, flags, 0644, DB_BTREE, &info);
                mdb.idx = dbopen(mdb.idxn, flags, 0644, DB_RECNO, NULL);
 


@@ -430,12 +441,12 @@ main(int argc, char *argv[])
                        exit((int)MANDOCLEVEL_SYSERR);
                }
 
                        exit((int)MANDOCLEVEL_SYSERR);
                }
 

-               ofile_argbuild(argc, argv, &of);
+               ofile_argbuild(argc, argv, &of, dir);

 
                if (NULL == of)
                        goto out;
 
 
                if (NULL == of)
                        goto out;
 

-               index_prune(of, &mdb, &recs);
+               index_prune(of, &mdb, &recs, dir);

 
                /*
                 * Go to the root of the respective manual tree.
 
                /*
                 * Go to the root of the respective manual tree.


@@ -449,7 +460,7 @@ main(int argc, char *argv[])
                                exit((int)MANDOCLEVEL_SYSERR);
                        }
                        index_merge(of, mp, &dbuf, &buf, hash,
                                exit((int)MANDOCLEVEL_SYSERR);
                        }
                        index_merge(of, mp, &dbuf, &buf, hash,

-                                       &mdb, &recs);
+                                       &mdb, &recs, dir);

                }
 
                goto out;
                }
 
                goto out;


@@ -464,38 +475,27 @@ main(int argc, char *argv[])
        if (argc > 0) {
                dirs.paths = mandoc_calloc(argc, sizeof(char *));
                dirs.sz = argc;
        if (argc > 0) {
                dirs.paths = mandoc_calloc(argc, sizeof(char *));
                dirs.sz = argc;

-               for (i = 0; i < argc; i++) {
-                       if (NULL == (cp = realpath(argv[i], pbuf))) {
-                               perror(argv[i]);
-                               goto out;
-                       }
-                       dirs.paths[i] = mandoc_strdup(cp);
-               }
+               for (i = 0; i < argc; i++) 
+                       dirs.paths[i] = mandoc_strdup(argv[i]);

        } else
                manpath_parse(&dirs, dir, NULL, NULL);
 
        for (i = 0; i < dirs.sz; i++) {
        } else
                manpath_parse(&dirs, dir, NULL, NULL);
 
        for (i = 0; i < dirs.sz; i++) {

-               mdb.idxn[0] = mdb.dbn[0] = '\0';
-
-               strlcat(mdb.dbn, dirs.paths[i], MAXPATHLEN);
-               strlcat(mdb.dbn, "/", MAXPATHLEN);
-               sz1 = strlcat(mdb.dbn, MANDOC_DB, MAXPATHLEN);
-
-               strlcat(mdb.idxn, dirs.paths[i], MAXPATHLEN);
-               strlcat(mdb.idxn, "/", MAXPATHLEN);
-               sz2 = strlcat(mdb.idxn, MANDOC_IDX, MAXPATHLEN);
+               /*
+                * Go to the root of the respective manual tree.
+                * This must work or no manuals may be found:
+                * They are indexed relative to the root.
+                */

 
 

-               if (sz1 >= MAXPATHLEN || sz2 >= MAXPATHLEN) {
-                       fprintf(stderr, "%s: path too long\n",
-                                       dirs.paths[i]);
-                       exit((int)MANDOCLEVEL_BADARG);
+               if (-1 == chdir(dirs.paths[i])) {
+                       perror(dirs.paths[i]);
+                       exit((int)MANDOCLEVEL_SYSERR);

                }
 
                }
 

-               if (mdb.db)
-                       (*mdb.db->close)(mdb.db);
-               if (mdb.idx)
-                       (*mdb.idx->close)(mdb.idx);
+               strlcpy(mdb.dbn, MANDOC_DB, MAXPATHLEN);
+               strlcpy(mdb.idxn, MANDOC_IDX, MAXPATHLEN);

 
 

+               flags = O_CREAT | O_TRUNC | O_RDWR;

                mdb.db = dbopen(mdb.dbn, flags, 0644, DB_BTREE, &info);
                mdb.idx = dbopen(mdb.idxn, flags, 0644, DB_RECNO, NULL);
 
                mdb.db = dbopen(mdb.dbn, flags, 0644, DB_BTREE, &info);
                mdb.idx = dbopen(mdb.idxn, flags, 0644, DB_RECNO, NULL);
 


@@ -507,30 +507,24 @@ main(int argc, char *argv[])
                        exit((int)MANDOCLEVEL_SYSERR);
                }
 
                        exit((int)MANDOCLEVEL_SYSERR);
                }
 

-               ofile_free(of);
-               of = NULL;
-
-               if (-1 == chdir(dirs.paths[i])) {
-                       perror(dirs.paths[i]);
-                       exit((int)MANDOCLEVEL_SYSERR);
-               }
-
-               ofile_dirbuild(".", "", "", 0, &of);
-               if (NULL == of)
-                       continue;
-

                /*
                /*

-                * Go to the root of the respective manual tree.
-                * This must work or no manuals may be found (they're
-                * indexed relative to the root).
+                * Search for manuals and fill the new database.

                 */
 
                 */
 

-               if (-1 == chdir(dirs.paths[i])) {
-                       perror(dirs.paths[i]);
-                       exit((int)MANDOCLEVEL_SYSERR);
+               strlcpy(dirbuf, dirs.paths[i], MAXPATHLEN);
+               ofile_dirbuild(".", "", "", 0, &of, dirbuf);
+
+               if (NULL != of) {
+                       index_merge(of, mp, &dbuf, &buf, hash,
+                            &mdb, &recs, dirs.paths[i]);
+                       ofile_free(of);
+                       of = NULL;

                }
 
                }
 

-               index_merge(of, mp, &dbuf, &buf, hash, &mdb, &recs);
+               (*mdb.db->close)(mdb.db);
+               (*mdb.idx->close)(mdb.idx);
+               mdb.db = NULL;
+               mdb.idx = NULL;

        }
 
 out:
        }
 
 out:


@@ -553,7 +547,7 @@ out:
 
 usage:
        fprintf(stderr,
 
 usage:
        fprintf(stderr,

-               "usage: %s [-avvv] [-C file] | dir ... | -t file ...\n"
+               "usage: %s [-av] [-C file] | dir ... | -t file ...\n"

                "                        -d dir [file ...] | "
                "-u dir [file ...]\n",
                progname);
                "                        -d dir [file ...] | "
                "-u dir [file ...]\n",
                progname);


@@ -564,13 +558,17 @@ usage:
 void
 index_merge(const struct of *of, struct mparse *mp,
                struct buf *dbuf, struct buf *buf, DB *hash,
 void
 index_merge(const struct of *of, struct mparse *mp,
                struct buf *dbuf, struct buf *buf, DB *hash,

-               struct mdb *mdb, struct recs *recs)
+               struct mdb *mdb, struct recs *recs,
+               const char *basedir)

 {
        recno_t          rec;
        int              ch, skip;
        DBT              key, val;
 {
        recno_t          rec;
        int              ch, skip;
        DBT              key, val;

+       DB              *files;  /* temporary file name table */
+       char             emptystring[1] = {'\0'};

        struct mdoc     *mdoc;
        struct man      *man;
        struct mdoc     *mdoc;
        struct man      *man;

+       char            *p;

        const char      *fn, *msec, *march, *mtitle;
        uint64_t         mask;
        size_t           sv;
        const char      *fn, *msec, *march, *mtitle;
        uint64_t         mask;
        size_t           sv;


@@ -578,6 +576,11 @@ index_merge(const struct of *of, struct mparse *mp,
        uint64_t         vbuf[2];
        char             type;
 
        uint64_t         vbuf[2];
        char             type;
 

+       if (warnings) {
+               files = NULL;
+               hash_reset(&files);
+       }
+

        rec = 0;
        for (of = of->first; of; of = of->next) {
                fn = of->fname;
        rec = 0;
        for (of = of->first; of; of = of->next) {
                fn = of->fname;


@@ -614,52 +617,95 @@ index_merge(const struct of *of, struct mparse *mp,
                }
 
                /*
                }
 
                /*

-                * By default, skip a file if the manual section
-                * and architecture given in the file disagree
-                * with the directory where the file is located.
+                * Check whether the manual section given in a file
+                * agrees with the directory where the file is located.
+                * Some manuals have suffixes like (3p) on their
+                * section number either inside the file or in the
+                * directory name, some are linked into more than one
+                * section, like encrypt(1) = makekey(8).  Do not skip
+                * manuals for such reasons.

                 */
 
                skip = 0;
                assert(of->sec);
                assert(msec);
                 */
 
                skip = 0;
                assert(of->sec);
                assert(msec);

-               if (strcasecmp(msec, of->sec)) {
-                       if (warnings)
-                               fprintf(stderr, "%s: "
-                                       "section \"%s\" manual "
-                                       "in \"%s\" directory\n",
-                                       fn, msec, of->sec);
-                       skip = 1;
-               }
+               if (strcasecmp(msec, of->sec))
+                       WARNING(fn, basedir, "Section \"%s\" manual "
+                               "in \"%s\" directory", msec, of->sec);
+               /*
+                * Manual page directories exist for each kernel
+                * architecture as returned by machine(1).
+                * However, many manuals only depend on the
+                * application architecture as returned by arch(1).
+                * For example, some (2/ARM) manuals are shared
+                * across the "armish" and "zaurus" kernel
+                * architectures.
+                * A few manuals are even shared across completely
+                * different architectures, for example fdformat(1)
+                * on amd64, i386, sparc, and sparc64.
+                * Thus, warn about architecture mismatches,
+                * but don't skip manuals for this reason.
+                */

 
                assert(of->arch);
                assert(march);
 
                assert(of->arch);
                assert(march);

-               if (strcasecmp(march, of->arch)) {
-                       if (warnings)
-                               fprintf(stderr, "%s: "
-                                       "architecture \"%s\" manual "
-                                       "in \"%s\" directory\n",
-                                       fn, march, of->arch);
-                       skip = 1;
-               }
+               if (strcasecmp(march, of->arch))
+                       WARNING(fn, basedir, "Architecture \"%s\" "
+                               "manual in \"%s\" directory", 
+                               march, of->arch);

 
                /*
                 * By default, skip a file if the title given
                 * in the file disagrees with the file name.
 
                /*
                 * By default, skip a file if the title given
                 * in the file disagrees with the file name.

-                * If both agree, use the file name as the title,
-                * because the one in the file usually is all caps.
+                * Do not warn, this happens for all MLINKs.

                 */
 
                assert(of->title);
                assert(mtitle);
                 */
 
                assert(of->title);
                assert(mtitle);

-               if (strcasecmp(mtitle, of->title)) {
-                       if (warnings)
-                               fprintf(stderr, "%s: "
-                                       "title \"%s\" in file "
-                                       "but \"%s\" in filename\n",
-                                       fn, mtitle, of->title);
+               if (strcasecmp(mtitle, of->title))

                        skip = 1;
                        skip = 1;

-               } else
-                       mtitle = of->title;
+
+               /*
+                * Build a title string for the file.  If it matches
+                * the location of the file, remember the title as
+                * found; else, remember it as missing.
+                */
+
+               if (warnings) {
+                       buf->len = 0;
+                       buf_appendb(buf, mtitle, strlen(mtitle));
+                       buf_appendb(buf, "(", 1);
+                       buf_appendb(buf, msec, strlen(msec));
+                       if ('\0' != *march) {
+                               buf_appendb(buf, "/", 1);
+                               buf_appendb(buf, march, strlen(march));
+                       }
+                       buf_appendb(buf, ")", 2);
+                       for (p = buf->cp; '\0' != *p; p++)
+                               *p = tolower(*p);
+                       key.data = buf->cp;
+                       key.size = buf->len;
+                       val.data = NULL;
+                       val.size = 0;
+                       if (0 == skip)
+                               val.data = emptystring;
+                       else {
+                               ch = (*files->get)(files, &key, &val, 0);
+                               if (ch < 0) {
+                                       perror("hash");
+                                       exit((int)MANDOCLEVEL_SYSERR);
+                               } else if (ch > 0) {
+                                       val.data = (void *)fn;
+                                       val.size = strlen(fn) + 1;
+                               } else
+                                       val.data = NULL;
+                       }
+                       if (NULL != val.data &&
+                           (*files->put)(files, &key, &val, 0) < 0) {
+                               perror("hash");
+                               exit((int)MANDOCLEVEL_SYSERR);
+                       }
+               }

 
                if (skip && !use_all)
                        continue;
 
                if (skip && !use_all)
                        continue;


@@ -667,18 +713,20 @@ index_merge(const struct of *of, struct mparse *mp,
                /*
                 * The index record value consists of a nil-terminated
                 * filename, a nil-terminated manual section, and a
                /*
                 * The index record value consists of a nil-terminated
                 * filename, a nil-terminated manual section, and a

-                * nil-terminated description.  Since the description
-                * may not be set, we set a sentinel to see if we're
-                * going to write a nil byte in its place.
+                * nil-terminated description.  Use the actual
+                * location of the file, such that the user can find
+                * it with man(1).  Since the description may not be
+                * set, we set a sentinel to see if we're going to
+                * write a nil byte in its place.

                 */
 
                dbuf->len = 0;
                type = mdoc ? 'd' : (man ? 'a' : 'c');
                buf_appendb(dbuf, &type, 1);
                buf_appendb(dbuf, fn, strlen(fn) + 1);
                 */
 
                dbuf->len = 0;
                type = mdoc ? 'd' : (man ? 'a' : 'c');
                buf_appendb(dbuf, &type, 1);
                buf_appendb(dbuf, fn, strlen(fn) + 1);

-               buf_appendb(dbuf, msec, strlen(msec) + 1);
-               buf_appendb(dbuf, mtitle, strlen(mtitle) + 1);
-               buf_appendb(dbuf, march, strlen(march) + 1);
+               buf_appendb(dbuf, of->sec, strlen(of->sec) + 1);
+               buf_appendb(dbuf, of->title, strlen(of->title) + 1);
+               buf_appendb(dbuf, of->arch, strlen(of->arch) + 1);

 
                sv = dbuf->len;
 
 
                sv = dbuf->len;
 


@@ -694,13 +742,21 @@ index_merge(const struct of *of, struct mparse *mp,
                else if (man)
                        pman_node(hash, buf, dbuf, man_node(man));
                else
                else if (man)
                        pman_node(hash, buf, dbuf, man_node(man));
                else

-                       pformatted(hash, buf, dbuf, of);
+                       pformatted(hash, buf, dbuf, of, basedir);

 
                /* Test mode, do not access any database. */
 
                if (NULL == mdb->db || NULL == mdb->idx)
                        continue;
 
 
                /* Test mode, do not access any database. */
 
                if (NULL == mdb->db || NULL == mdb->idx)
                        continue;
 

+               /*
+                * Make sure the file name is always registered
+                * as an .Nm search key.
+                */
+               buf->len = 0;
+               buf_append(buf, of->title);
+               hash_put(hash, buf, TYPE_Nm);
+

                /*
                 * Reclaim an empty index record, if available.
                 * Use its record number for all new btree nodes.
                /*
                 * Reclaim an empty index record, if available.
                 * Use its record number for all new btree nodes.


@@ -751,10 +807,27 @@ index_merge(const struct of *of, struct mparse *mp,
                val.size = dbuf->len;
 
                if (verb)
                val.size = dbuf->len;
 
                if (verb)

-                       printf("%s: adding to index\n", fn);
+                       printf("%s: Adding to index: %s\n", basedir, fn);

 
                dbt_put(mdb->idx, mdb->idxn, &key, &val);
        }
 
                dbt_put(mdb->idx, mdb->idxn, &key, &val);
        }

+
+       /*
+        * Iterate the remembered file titles and check that
+        * all files can be found by their main title.
+        */
+
+       if (warnings) {
+               seq = R_FIRST;
+               while (0 == (*files->seq)(files, &key, &val, seq)) {
+                       seq = R_NEXT;
+                       if (val.size)
+                               WARNING((char *)val.data, basedir, 
+                                       "Probably unreachable, title "
+                                       "is %s", (char *)key.data);
+               }
+               (*files->close)(files);
+       }

 }
 
 /*
 }
 
 /*


@@ -764,7 +837,8 @@ index_merge(const struct of *of, struct mparse *mp,
  * in `idx' (zeroing its value size).
  */
 static void
  * in `idx' (zeroing its value size).
  */
 static void

-index_prune(const struct of *ofile, struct mdb *mdb, struct recs *recs)
+index_prune(const struct of *ofile, struct mdb *mdb, 
+               struct recs *recs, const char *basedir)

 {
        const struct of *of;
        const char      *fn;
 {
        const struct of *of;
        const char      *fn;


@@ -839,7 +913,8 @@ index_prune(const struct of *ofile, struct mdb *mdb, struct recs *recs)
                }
 
                if (verb)
                }
 
                if (verb)

-                       printf("%s: deleting from index\n", fn);
+                       printf("%s: Deleting from index: %s\n", 
+                                       basedir, fn);

 
                val.size = 0;
                ch = (*mdb->idx->put)(mdb->idx, &key, &val, R_CURSOR);
 
                val.size = 0;
                ch = (*mdb->idx->put)(mdb->idx, &key, &val, R_CURSOR);


@@ -1248,8 +1323,8 @@ static int
 pman_node(MAN_ARGS)
 {
        const struct man_node *head, *body;
 pman_node(MAN_ARGS)
 {
        const struct man_node *head, *body;

-       const char      *start, *sv;
-       size_t           sz;
+       char            *start, *sv, *title;
+       size_t           sz, titlesz;

 
        if (NULL == n)
                return(0);
 
        if (NULL == n)
                return(0);


@@ -1272,8 +1347,54 @@ pman_node(MAN_ARGS)
                                NULL != (body = body->child) &&
                                MAN_TEXT == body->type) {
 
                                NULL != (body = body->child) &&
                                MAN_TEXT == body->type) {
 

-                       assert(body->string);
-                       start = sv = body->string;
+                       title = NULL;
+                       titlesz = 0;
+                       /*
+                        * Suck the entire NAME section into memory.
+                        * Yes, we might run away.
+                        * But too many manuals have big, spread-out
+                        * NAME sections over many lines.
+                        */
+                       for ( ; NULL != body; body = body->next) {
+                               if (MAN_TEXT != body->type)
+                                       break;
+                               if (0 == (sz = strlen(body->string)))
+                                       continue;
+                               title = mandoc_realloc
+                                       (title, titlesz + sz + 1);
+                               memcpy(title + titlesz, body->string, sz);
+                               titlesz += sz + 1;
+                               title[(int)titlesz - 1] = ' ';
+                       }
+                       if (NULL == title)
+                               return(0);
+
+                       title = mandoc_realloc(title, titlesz + 1);
+                       title[(int)titlesz] = '\0';
+
+                       /* Skip leading space.  */
+
+                       sv = title;
+                       while (isspace((unsigned char)*sv))
+                               sv++;
+
+                       if (0 == (sz = strlen(sv))) {
+                               free(title);
+                               return(0);
+                       }
+
+                       /* Erase trailing space. */
+
+                       start = &sv[sz - 1];
+                       while (start > sv && isspace((unsigned char)*start))
+                               *start-- = '\0';
+
+                       if (start == sv) {
+                               free(title);
+                               return(0);
+                       }
+
+                       start = sv;

 
                        /* 
                         * Go through a special heuristic dance here.
 
                        /* 
                         * Go through a special heuristic dance here.


@@ -1311,14 +1432,17 @@ pman_node(MAN_ARGS)
 
                        if (sv == start) {
                                buf_append(buf, start);
 
                        if (sv == start) {
                                buf_append(buf, start);

+                               free(title);

                                return(1);
                        }
 
                                return(1);
                        }
 

-                       while (' ' == *start)
+                       while (isspace((unsigned char)*start))

                                start++;
 
                        if (0 == strncmp(start, "-", 1))
                                start += 1;
                                start++;
 
                        if (0 == strncmp(start, "-", 1))
                                start += 1;

+                       else if (0 == strncmp(start, "\\-\\-", 4))
+                               start += 4;

                        else if (0 == strncmp(start, "\\-", 2))
                                start += 2;
                        else if (0 == strncmp(start, "\\(en", 4))
                        else if (0 == strncmp(start, "\\-", 2))
                                start += 2;
                        else if (0 == strncmp(start, "\\(en", 4))


@@ -1334,6 +1458,7 @@ pman_node(MAN_ARGS)
                        buf_appendb(buf, start, sz);
 
                        hash_put(hash, buf, TYPE_Nd);
                        buf_appendb(buf, start, sz);
 
                        hash_put(hash, buf, TYPE_Nd);

+                       free(title);

                }
        }
 
                }
        }
 


@@ -1349,16 +1474,15 @@ pman_node(MAN_ARGS)
  * By necessity, this involves rather crude guesswork.
  */
 static void
  * By necessity, this involves rather crude guesswork.
  */
 static void

-pformatted(DB *hash, struct buf *buf, struct buf *dbuf,
-                const struct of *of)
+pformatted(DB *hash, struct buf *buf, struct buf *dbuf, 
+               const struct of *of, const char *basedir)

 {
        FILE            *stream;
 {
        FILE            *stream;

-       char            *line, *p;
-       size_t           len, plen;
+       char            *line, *p, *title;
+       size_t           len, plen, titlesz;

 
        if (NULL == (stream = fopen(of->fname, "r"))) {
 
        if (NULL == (stream = fopen(of->fname, "r"))) {

-               if (warnings)
-                       perror(of->fname);
+               WARNING(of->fname, basedir, "%s", strerror(errno));

                return;
        }
 
                return;
        }
 


@@ -1387,6 +1511,31 @@ pformatted(DB *hash, struct buf *buf, struct buf *dbuf,
        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,
+        * appending a trailing space.
+        * Ignore empty (whitespace-only) lines.
+        */
+
+       titlesz = 0;
+       title = NULL;
+
+       while (NULL != (line = fgetln(stream, &len))) {
+               if (' ' != *line || '\n' != line[(int)len - 1])
+                       break;
+               while (len > 0 && isspace((unsigned char)*line)) {
+                       line++;
+                       len--;
+               }
+               if (1 == len)
+                       continue;
+               title = mandoc_realloc(title, titlesz + len);
+               memcpy(title + titlesz, line, len);
+               titlesz += len;
+               title[(int)titlesz - 1] = ' ';
+       }

 
        /*
         * If no page content can be found, or the input line
 
        /*
         * If no page content can be found, or the input line


@@ -1395,18 +1544,18 @@ pformatted(DB *hash, struct buf *buf, struct buf *dbuf,
         * description.
         */
 
         * description.
         */
 

-       line = fgetln(stream, &len);
-       if (NULL == line || ' ' != *line || '\n' != line[(int)len - 1]) {
-               if (warnings)
-                       fprintf(stderr, "%s: cannot find NAME section\n",
-                                       of->fname);
+       if (NULL == title || '\0' == *title) {
+               WARNING(of->fname, basedir, 
+                       "Cannot find NAME section");

                buf_appendb(dbuf, buf->cp, buf->size);
                hash_put(hash, buf, TYPE_Nd);
                fclose(stream);
                buf_appendb(dbuf, buf->cp, buf->size);
                hash_put(hash, buf, TYPE_Nd);
                fclose(stream);

+               free(title);

                return;
        }
 
                return;
        }
 

-       line[(int)--len] = '\0';
+       title = mandoc_realloc(title, titlesz + 1);
+       title[(int)titlesz] = '\0';

 
        /*
         * Skip to the first dash.
 
        /*
         * Skip to the first dash.


@@ -1414,20 +1563,16 @@ pformatted(DB *hash, struct buf *buf, struct buf *dbuf,
         * bytes).
         */
 
         * bytes).
         */
 

-       if (NULL != (p = strstr(line, "- "))) {
+       if (NULL != (p = strstr(title, "- "))) {

                for (p += 2; ' ' == *p || '\b' == *p; p++)
                        /* Skip to next word. */ ;
        } else {
                for (p += 2; ' ' == *p || '\b' == *p; p++)
                        /* Skip to next word. */ ;
        } else {

-               if (warnings)
-                       fprintf(stderr, "%s: no dash in title line\n",
-                                       of->fname);
-               p = line;
+               WARNING(of->fname, basedir, 
+                       "No dash in title line");
+               p = title;

        }
 
        }
 

-       if ((plen = strlen(p)) > 70) {
-               plen = 70;
-               p[plen] = '\0';
-       }
+       plen = strlen(p);

 
        /* Strip backspace-encoding from line. */
 
 
        /* Strip backspace-encoding from line. */
 


@@ -1446,13 +1591,16 @@ pformatted(DB *hash, struct buf *buf, struct buf *dbuf,
        buf_appendb(buf, p, plen + 1);
        hash_put(hash, buf, TYPE_Nd);
        fclose(stream);
        buf_appendb(buf, p, plen + 1);
        hash_put(hash, buf, TYPE_Nd);
        fclose(stream);

+       free(title);

 }
 
 static void
 }
 
 static void

-ofile_argbuild(int argc, char *argv[], struct of **of)
+ofile_argbuild(int argc, char *argv[], 
+               struct of **of, const char *basedir)

 {
        char             buf[MAXPATHLEN];
 {
        char             buf[MAXPATHLEN];

-       char            *sec, *arch, *title, *p;
+       const char      *sec, *arch, *title;
+       char            *p;

        int              i, src_form;
        struct of       *nof;
 
        int              i, src_form;
        struct of       *nof;
 


@@ -1466,7 +1614,7 @@ ofile_argbuild(int argc, char *argv[], struct of **of)
                 */
 
                if (strlcpy(buf, argv[i], sizeof(buf)) >= sizeof(buf)) {
                 */
 
                if (strlcpy(buf, argv[i], sizeof(buf)) >= sizeof(buf)) {

-                       fprintf(stderr, "%s: path too long\n", argv[i]);
+                       fprintf(stderr, "%s: Path too long\n", argv[i]);

                        continue;
                }
                sec = arch = title = "";
                        continue;
                }
                sec = arch = title = "";


@@ -1498,11 +1646,8 @@ ofile_argbuild(int argc, char *argv[], struct of **of)
                        break;
                }
                if ('\0' == *title) {
                        break;
                }
                if ('\0' == *title) {

-                       if (warnings)
-                               fprintf(stderr,
-                                   "%s: cannot deduce title "
-                                   "from filename\n",
-                                   argv[i]);
+                       WARNING(argv[i], basedir, 
+                               "Cannot deduce title from filename");

                        title = buf;
                }
 
                        title = buf;
                }
 


@@ -1521,8 +1666,6 @@ ofile_argbuild(int argc, char *argv[], struct of **of)
                 * Add the structure to the list.
                 */
 
                 * Add the structure to the list.
                 */
 

-               if (verb > 1)
-                       printf("%s: scheduling\n", argv[i]);

                if (NULL == *of) {
                        *of = nof;
                        (*of)->first = nof;
                if (NULL == *of) {
                        *of = nof;
                        (*of)->first = nof;


@@ -1538,13 +1681,13 @@ ofile_argbuild(int argc, char *argv[], struct of **of)
  * Recursively build up a list of files to parse.
  * We use this instead of ftw() and so on because I don't want global
  * variables hanging around.
  * Recursively build up a list of files to parse.
  * We use this instead of ftw() and so on because I don't want global
  * variables hanging around.

- * This ignores the whatis.db and whatis.index files, but assumes that
+ * This ignores the mandocdb.db and mandocdb.index files, but assumes that

  * everything else is a manual.
  * Pass in a pointer to a NULL structure for the first invocation.
  */
 static void
 ofile_dirbuild(const char *dir, const char* psec, const char *parch,
  * everything else is a manual.
  * Pass in a pointer to a NULL structure for the first invocation.
  */
 static void
 ofile_dirbuild(const char *dir, const char* psec, const char *parch,

-               int p_src_form, struct of **of)
+               int p_src_form, struct of **of, char *basedir)

 {
        char             buf[MAXPATHLEN];
        size_t           sz;
 {
        char             buf[MAXPATHLEN];
        size_t           sz;


@@ -1556,8 +1699,7 @@ ofile_dirbuild(const char *dir, const char* psec, const char *parch,
        int              src_form;
 
        if (NULL == (d = opendir(dir))) {
        int              src_form;
 
        if (NULL == (d = opendir(dir))) {

-               if (warnings)
-                       perror(dir);
+               WARNING("", dir, "%s", strerror(errno));

                return;
        }
 
                return;
        }
 


@@ -1587,9 +1729,7 @@ ofile_dirbuild(const char *dir, const char* psec, const char *parch,
                                        src_form |= MANDOC_FORM;
                                        sec = fn + 3;
                                } else {
                                        src_form |= MANDOC_FORM;
                                        sec = fn + 3;
                                } else {

-                                       if (warnings) fprintf(stderr,
-                                           "%s/%s: bad section\n",
-                                           dir, fn);
+                                       WARNING(fn, basedir, "Bad section");

                                        if (use_all)
                                                sec = fn;
                                        else
                                        if (use_all)
                                                sec = fn;
                                        else


@@ -1597,16 +1737,13 @@ ofile_dirbuild(const char *dir, const char* psec, const char *parch,
                                }
                        } else if ('\0' == *arch) {
                                if (NULL != strchr(fn, '.')) {
                                }
                        } else if ('\0' == *arch) {
                                if (NULL != strchr(fn, '.')) {

-                                       if (warnings) fprintf(stderr,
-                                           "%s/%s: bad architecture\n",
-                                           dir, fn);
+                                       WARNING(fn, basedir, "Bad architecture");

                                        if (0 == use_all)
                                                continue;
                                }
                                arch = fn;
                        } else {
                                        if (0 == use_all)
                                                continue;
                                }
                                arch = fn;
                        } else {

-                               if (warnings) fprintf(stderr, "%s/%s: "
-                                   "excessive subdirectory\n", dir, fn);
+                               WARNING(fn, basedir, "Excessive subdirectory");

                                if (0 == use_all)
                                        continue;
                        }
                                if (0 == use_all)
                                        continue;
                        }


@@ -1614,35 +1751,31 @@ ofile_dirbuild(const char *dir, const char* psec, const char *parch,
                        buf[0] = '\0';
                        strlcat(buf, dir, MAXPATHLEN);
                        strlcat(buf, "/", MAXPATHLEN);
                        buf[0] = '\0';
                        strlcat(buf, dir, MAXPATHLEN);
                        strlcat(buf, "/", MAXPATHLEN);

+                       strlcat(basedir, "/", MAXPATHLEN);
+                       strlcat(basedir, fn, MAXPATHLEN);

                        sz = strlcat(buf, fn, MAXPATHLEN);
 
                        if (MAXPATHLEN <= sz) {
                        sz = strlcat(buf, fn, MAXPATHLEN);
 
                        if (MAXPATHLEN <= sz) {

-                               if (warnings) fprintf(stderr, "%s/%s: "
-                                   "path too long\n", dir, fn);
+                               WARNING(fn, basedir, "Path too long");

                                continue;
                        }
 
                                continue;
                        }
 

-                       if (verb > 1)
-                               printf("%s: scanning\n", buf);
+                       ofile_dirbuild(buf, sec, arch, 
+                                       src_form, of, basedir);

 
 

-                       ofile_dirbuild(buf, sec, arch, src_form, of);
+                       p = strrchr(basedir, '/');
+                       *p = '\0';

                        continue;
                }
 
                if (DT_REG != dp->d_type) {
                        continue;
                }
 
                if (DT_REG != dp->d_type) {

-                       if (warnings)
-                               fprintf(stderr,
-                                   "%s/%s: not a regular file\n",
-                                   dir, fn);
+                       WARNING(fn, basedir, "Not a regular file");

                        continue;
                }
                if (!strcmp(MANDOC_DB, fn) || !strcmp(MANDOC_IDX, fn))
                        continue;
                if ('\0' == *psec) {
                        continue;
                }
                if (!strcmp(MANDOC_DB, fn) || !strcmp(MANDOC_IDX, fn))
                        continue;
                if ('\0' == *psec) {

-                       if (warnings)
-                               fprintf(stderr,
-                                   "%s/%s: file outside section\n",
-                                   dir, fn);
+                       WARNING(fn, basedir, "File outside section");

                        if (0 == use_all)
                                continue;
                }
                        if (0 == use_all)
                                continue;
                }


@@ -1655,20 +1788,14 @@ ofile_dirbuild(const char *dir, const char* psec, const char *parch,
 
                suffix = strrchr(fn, '.');
                if (NULL == suffix) {
 
                suffix = strrchr(fn, '.');
                if (NULL == suffix) {

-                       if (warnings)
-                               fprintf(stderr,
-                                   "%s/%s: no filename suffix\n",
-                                   dir, fn);
+                       WARNING(fn, basedir, "No filename suffix");

                        if (0 == use_all)
                                continue;
                } else if ((MANDOC_SRC & src_form &&
                                strcmp(suffix + 1, psec)) ||
                            (MANDOC_FORM & src_form &&
                                strcmp(suffix + 1, "0"))) {
                        if (0 == use_all)
                                continue;
                } else if ((MANDOC_SRC & src_form &&
                                strcmp(suffix + 1, psec)) ||
                            (MANDOC_FORM & src_form &&
                                strcmp(suffix + 1, "0"))) {

-                       if (warnings)
-                               fprintf(stderr,
-                                   "%s/%s: wrong filename suffix\n",
-                                   dir, fn);
+                       WARNING(fn, basedir, "Wrong filename suffix");

                        if (0 == use_all)
                                continue;
                        if ('0' == suffix[1])
                        if (0 == use_all)
                                continue;
                        if ('0' == suffix[1])


@@ -1702,9 +1829,7 @@ ofile_dirbuild(const char *dir, const char* psec, const char *parch,
                        strlcat(buf, "/", MAXPATHLEN);
                        sz = strlcat(buf, fn, MAXPATHLEN);
                        if (sz >= MAXPATHLEN) {
                        strlcat(buf, "/", MAXPATHLEN);
                        sz = strlcat(buf, fn, MAXPATHLEN);
                        if (sz >= MAXPATHLEN) {

-                               if (warnings) fprintf(stderr,
-                                   "%s/%s: path too long\n",
-                                   dir, fn);
+                               WARNING(fn, basedir, "Path too long");

                                continue;
                        }
                        q = strrchr(buf, '.');
                                continue;
                        }
                        q = strrchr(buf, '.');


@@ -1712,9 +1837,7 @@ ofile_dirbuild(const char *dir, const char* psec, const char *parch,
                                *q = '\0';
                                sz = strlcat(buf, psec, MAXPATHLEN);
                                if (sz >= MAXPATHLEN) {
                                *q = '\0';
                                sz = strlcat(buf, psec, MAXPATHLEN);
                                if (sz >= MAXPATHLEN) {

-                                       if (warnings) fprintf(stderr,
-                                           "%s/%s: path too long\n",
-                                           dir, fn);
+                                       WARNING(fn, basedir, "Path too long");

                                        continue;
                                }
                                if (0 == access(buf, R_OK))
                                        continue;
                                }
                                if (0 == access(buf, R_OK))


@@ -1730,8 +1853,7 @@ ofile_dirbuild(const char *dir, const char* psec, const char *parch,
                }
                sz = strlcat(buf, fn, MAXPATHLEN);
                if (sz >= MAXPATHLEN) {
                }
                sz = strlcat(buf, fn, MAXPATHLEN);
                if (sz >= MAXPATHLEN) {

-                       if (warnings) fprintf(stderr,
-                           "%s/%s: path too long\n", dir, fn);
+                       WARNING(fn, basedir, "Path too long");

                        continue;
                }
 
                        continue;
                }
 


@@ -1754,8 +1876,6 @@ ofile_dirbuild(const char *dir, const char* psec, const char *parch,
                 * Add the structure to the list.
                 */
 
                 * Add the structure to the list.
                 */
 

-               if (verb > 1)
-                       printf("%s: scheduling\n", buf);

                if (NULL == *of) {
                        *of = nof;
                        (*of)->first = nof;
                if (NULL == *of) {
                        *of = nof;
                        (*of)->first = nof;


@@ -1774,7 +1894,10 @@ ofile_free(struct of *of)
 {
        struct of       *nof;
 
 {
        struct of       *nof;
 

-       while (of) {
+       if (NULL != of)
+               of = of->first;
+
+       while (NULL != of) {

                nof = of->next;
                free(of->fname);
                free(of->sec);
                nof = of->next;
                free(of->fname);
                free(of->sec);