fix order of messages

[mandoc.git] / mandocdb.c

diff --git a/mandocdb.c b/mandocdb.c
index 10023d08d7bbfb410d7481d73ede89cb6c4aa54a..b9e4fb1c8132455efb80fb341a4a7010108aa502 100644 (file)
--- a/mandocdb.c
+++ b/mandocdb.c
@@ -1,4 +1,4 @@
-/*     $Id: mandocdb.c,v 1.246 2017/04/24 23:06:18 schwarze Exp $ */
+/*     $Id: mandocdb.c,v 1.250 2017/05/17 22:27:12 schwarze Exp $ */
 /*
  * Copyright (c) 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011-2017 Ingo Schwarze <schwarze@openbsd.org>
@@ -302,11 +302,8 @@ static     const struct mdoc_handler __mdocs[MDOC_MAX - MDOC_Dd] = {
        { NULL, 0, 0 },  /* En */
        { NULL, TYPE_Dx, NODE_NOSRC },  /* Dx */
        { NULL, 0, 0 },  /* %Q */
-       { NULL, 0, 0 },  /* br */
-       { NULL, 0, 0 },  /* sp */
        { NULL, 0, 0 },  /* %U */
        { NULL, 0, 0 },  /* Ta */
-       { NULL, 0, 0 },  /* ll */
 };
 static const struct mdoc_handler *const mdocs = __mdocs - MDOC_Dd;
 
@@ -1547,8 +1544,11 @@ parse_mdoc(struct mpage *mpage, const struct roff_meta *meta,
 {
 
        for (n = n->child; n != NULL; n = n->next) {
-               if (n->tok == TOKEN_NONE || n->flags & mdocs[n->tok].taboo)
+               if (n->tok == TOKEN_NONE ||
+                   n->tok < ROFF_MAX ||
+                   n->flags & mdocs[n->tok].taboo)
                        continue;
+               assert(n->tok >= MDOC_Dd && n->tok < MDOC_MAX);
                switch (n->type) {
                case ROFFT_ELEM:
                case ROFFT_BLOCK:
@@ -2122,6 +2122,23 @@ dbwrite(struct dba *dba)
        int              status;
        pid_t            child;
 
+       /*
+        * Do not write empty databases, and delete existing ones
+        * when makewhatis -u causes them to become empty.
+        */
+
+       dba_array_start(dba->pages);
+       if (dba_array_next(dba->pages) == NULL) {
+               if (unlink(MANDOC_DB) == -1)
+                       say(MANDOC_DB, "&unlink");
+               return;
+       }
+
+       /*
+        * Build the database in a temporary file,
+        * then atomically move it into place.
+        */
+
        if (dba_write(MANDOC_DB "~", dba) != -1) {
                if (rename(MANDOC_DB "~", MANDOC_DB) == -1) {
                        exitcode = (int)MANDOCLEVEL_SYSERR;
@@ -2131,6 +2148,11 @@ dbwrite(struct dba *dba)
                return;
        }
 
+       /*
+        * We lack write permission and cannot replace the database
+        * file, but let's at least check whether the data changed.
+        */
+
        (void)strlcpy(tfn, "/tmp/mandocdb.XXXXXXXX", sizeof(tfn));
        if (mkdtemp(tfn) == NULL) {
                exitcode = (int)MANDOCLEVEL_SYSERR;