[Patch v4 3/3] restore: transparently support gzipped input

[David Bremner]

We rely completely on zlib to do the right thing in detecting gzipped
input. Since our dump format is chosen to be 7 bit ascii, this should
be fine.
---
 notmuch-restore.c         | 37 +++++++++++++++++++++----------------
 test/T240-dump-restore.sh | 14 ++++++++++++++
 2 files changed, 35 insertions(+), 16 deletions(-)

diff --git a/notmuch-restore.c b/notmuch-restore.c
index c54d513..86bce20 100644
--- a/notmuch-restore.c
+++ b/notmuch-restore.c
@@ -22,6 +22,7 @@
 #include "hex-escape.h"
 #include "tag-util.h"
 #include "string-util.h"
+#include "zlib-extra.h"

 static regex_t regex;

@@ -128,7 +129,7 @@ notmuch_restore_command (notmuch_config_t *config, int 
argc, char *argv[])
     tag_op_list_t *tag_ops;

     char *input_file_name = NULL;
-    FILE *input = stdin;
+    gzFile input;
     char *line = NULL;
     void *line_ctx = NULL;
     size_t line_size;
@@ -163,13 +164,15 @@ notmuch_restore_command (notmuch_config_t *config, int 
argc, char *argv[])
     if (! accumulate)
        flags |= TAG_FLAG_REMOVE_ALL;

-    if (input_file_name) {
-       input = fopen (input_file_name, "r");
-       if (input == NULL) {
-           fprintf (stderr, "Error opening %s for reading: %s\n",
-                    input_file_name, strerror (errno));
-           return EXIT_FAILURE;
-       }
+    if (input_file_name)
+       input = gzopen (input_file_name, "r");
+    else
+       input = gzdopen (fileno (stdin), "r");
+
+    if (input == NULL) {
+       fprintf (stderr, "Error opening %s for (gzip) reading: %s\n",
+                input_file_name ? input_file_name : "stdin", strerror (errno));
+       return EXIT_FAILURE;
     }

     if (opt_index < argc) {
@@ -184,12 +187,17 @@ notmuch_restore_command (notmuch_config_t *config, int 
argc, char *argv[])
     }

     do {
-       line_len = getline (&line, &line_size, input);
+       util_status_t status;
+
+       status = gz_getline (line_ctx, &line, &line_size, &line_len, input);

        /* empty input file not considered an error */
-       if (line_len < 0)
+       if (status == UTIL_EOF)
            return EXIT_SUCCESS;

+       if (status)
+           return EXIT_FAILURE;
+
     } while ((line_len == 0) ||
             (line[0] == '#') ||
             /* the cast is safe because we checked about for line_len < 0 */
@@ -254,7 +262,7 @@ notmuch_restore_command (notmuch_config_t *config, int 
argc, char *argv[])
        if (ret)
            break;

-    }  while ((line_len = getline (&line, &line_size, input)) != -1);
+    }  while (gz_getline (line_ctx, &line, &line_size, &line_len, input) == 
UTIL_SUCCESS);

     if (line_ctx != NULL)
        talloc_free (line_ctx);
@@ -262,13 +270,10 @@ notmuch_restore_command (notmuch_config_t *config, int 
argc, char *argv[])
     if (input_format == DUMP_FORMAT_SUP)
        regfree (&regex);

-    if (line)
-       free (line);
-
     notmuch_database_destroy (notmuch);

-    if (input != stdin)
-       fclose (input);
+    if (input_file_name != NULL)
+       gzclose_r (input);

     return ret ? EXIT_FAILURE : EXIT_SUCCESS;
 }
diff --git a/test/T240-dump-restore.sh b/test/T240-dump-restore.sh
index d79aca8..50d4d48 100755
--- a/test/T240-dump-restore.sh
+++ b/test/T240-dump-restore.sh
@@ -80,6 +80,20 @@ notmuch dump --gzip --output=dump-gzip-outfile.gz
 gunzip dump-gzip-outfile.gz
 test_expect_equal_file dump.expected dump-gzip-outfile

+test_begin_subtest "restoring gzipped stdin"
+notmuch dump --gzip --output=backup.gz
+notmuch tag +new_tag '*'
+notmuch restore < backup.gz
+notmuch dump --output=dump.actual
+test_expect_equal_file dump.expected dump.actual
+
+test_begin_subtest "restoring gzipped file"
+notmuch dump --gzip --output=backup.gz
+notmuch tag +new_tag '*'
+notmuch restore --input=backup.gz
+notmuch dump --output=dump.actual
+test_expect_equal_file dump.expected dump.actual
+
 # Note, we assume all messages from cworth have a message-id
 # containing cworth.org

-- 
1.9.0