3 files changed, 23 insertions, 7 deletions

diff --git a/NEWS b/NEWS
index b883bc7..1ca9a32 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-GNU dbm NEWS -- history of user-visible changes. 2018-07-30
+GNU dbm NEWS -- history of user-visible changes. 2018-08-12
 Copyright (C) 1990-2018 Free Software Foundation, Inc.
 See the end of file for copying conditions.
 
@@ -11,6 +11,11 @@ Version 1.17 - 2018-07-30
 Both functions now return 0 on success. On error, they return -1
 and set gdbm_errno and errno to the appropriate error codes.
 
+* Fix bug in gdbm_dump function
+
+The function did not clear the GDBM_ITEM_NOT_FOUND error marker, which
+is set upon its normal termination.
+
 
 Version 1.16 - 2018-06-27
 
@@ -484,7 +489,7 @@ Copyright (C) 1990-2017 Free Software Foundation, Inc.
 Local variables:
 mode: outline
 paragraph-separate: "[  ]*$"
-eval: (add-hook 'write-file-hooks 'time-stamp)
+eval: (add-hook 'write-file-functions 'time-stamp)
 time-stamp-start: "changes. "
 time-stamp-format: "%:y-%02m-%02d"
 time-stamp-end: "\n"
diff --git a/src/gdbmdump.c b/src/gdbmdump.c
index daf6a43..2e6f5b0 100644
--- a/src/gdbmdump.c
+++ b/src/gdbmdump.c
@@ -112,17 +112,23 @@ _gdbm_dump_ascii (GDBM_FILE dbf, FILE *fp)
       count++;
     }
 
-  if (rc == 0 && (rc = gdbm_last_errno (dbf)) == 0)
-    {
-      
   /* FIXME: Something like that won't hurt, although load does not
      use it currently. */
   fprintf (fp, "#:count=%lu\n", (unsigned long) count);
   fprintf (fp, "# End of data\n");
+  
+  if (rc == 0)
+    {
+      rc = gdbm_last_errno (dbf);
+      if (rc == GDBM_ITEM_NOT_FOUND)
+        {
+          gdbm_clear_error (dbf);
+          gdbm_errno = GDBM_NO_ERROR;
+          rc = 0;
+        }
     }
   free (buffer);
 
-  
   return rc ? -1 : 0;
 }
 
diff --git a/src/gdbmexp.c b/src/gdbmexp.c
index 25ad5b2..56a792a 100644
--- a/src/gdbmexp.c
+++ b/src/gdbmexp.c
@@ -83,7 +83,12 @@ gdbm_export_to_file (GDBM_FILE dbf, FILE *fp)
       
       count++;
     }
-  if (gdbm_errno != GDBM_ITEM_NOT_FOUND)
+  if (gdbm_last_errno (dbf) == GDBM_ITEM_NOT_FOUND)
+    {
+      gdbm_clear_error (dbf);
+      gdbm_errno = GDBM_NO_ERROR;
+    }
+  else
     return -1;
   
   return count;