fix order of messages

[mandoc.git] / mandocdb.c

diff --git a/mandocdb.c b/mandocdb.c
index c81106b9d945f49e7a8ab4e8aa5fa96efd466c9a..b9e4fb1c8132455efb80fb341a4a7010108aa502 100644 (file)
--- a/mandocdb.c
+++ b/mandocdb.c
@@ -1,4 +1,4 @@
-/*     $Id: mandocdb.c,v 1.249 2017/05/05 15:17:32 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>
 /*
  * Copyright (c) 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011-2017 Ingo Schwarze <schwarze@openbsd.org>


@@ -2122,6 +2122,23 @@ dbwrite(struct dba *dba)
        int              status;
        pid_t            child;
 
        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;
        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;
        }
 
                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;
        (void)strlcpy(tfn, "/tmp/mandocdb.XXXXXXXX", sizeof(tfn));
        if (mkdtemp(tfn) == NULL) {
                exitcode = (int)MANDOCLEVEL_SYSERR;