notmuch-dump.c: Fix output file being closed twice

Fixed: If the output file for a dump was non-writeable, gzclose_w()
was called twice on the output file handle, resulting in SIGABRT.

diff --git a/notmuch-dump.c b/notmuch-dump.c
index 505c1469657cfac48945bd394a1aef06d7f74ee2..65e026394cf77e12d9fe3ba2772c395eb789b750 100644 (file)
--- a/notmuch-dump.c
+++ b/notmuch-dump.c
@@ -329,13 +329,15 @@ notmuch_database_dump (notmuch_database_t *notmuch,
        }
     }
 
        }
     }
 

-    if (gzclose_w (output) != Z_OK) {
+    ret = gzclose_w (output);
+    if (ret) {

        fprintf (stderr, "Error closing %s: %s\n", name_for_error,
                 gzerror (output, NULL));
        ret = EXIT_FAILURE;
        output = NULL;
        goto DONE;
        fprintf (stderr, "Error closing %s: %s\n", name_for_error,
                 gzerror (output, NULL));
        ret = EXIT_FAILURE;
        output = NULL;
        goto DONE;

-    }
+    } else
+        output = NULL;

 
     if (output_file_name) {
        ret = rename (tempname, output_file_name);
 
     if (output_file_name) {
        ret = rename (tempname, output_file_name);