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

diff --git a/fa/a5768031620a6fbb8e4a431e31f511ef922732 b/fa/a5768031620a6fbb8e4a431e31f511ef922732
new file mode 100644 (file)
index 0000000..e9c167b
--- /dev/null
+++ b/fa/a5768031620a6fbb8e4a431e31f511ef922732
@@ -0,0 +1,173 @@
+Return-Path: <bremner@tethera.net>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+       by olra.theworths.org (Postfix) with ESMTP id 220B4431FD4\r
+       for <notmuch@notmuchmail.org>; Sun, 30 Mar 2014 10:32:08 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]\r
+       autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id jcDcJzFGCjMe for <notmuch@notmuchmail.org>;\r
+       Sun, 30 Mar 2014 10:32:00 -0700 (PDT)\r
+Received: from yantan.tethera.net (yantan.tethera.net [199.188.72.155])\r
+       (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 3A859431FBF\r
+       for <notmuch@notmuchmail.org>; Sun, 30 Mar 2014 10:31:58 -0700 (PDT)\r
+Received: from remotemail by yantan.tethera.net with local (Exim 4.80)\r
+       (envelope-from <bremner@tethera.net>)\r
+       id 1WUJaP-0004Av-Tx; Sun, 30 Mar 2014 14:31:57 -0300\r
+Received: (nullmailer pid 29606 invoked by uid 1000); Sun, 30 Mar 2014\r
+       17:31:43 -0000\r
+From: David Bremner <david@tethera.net>\r
+To: notmuch@notmuchmail.org\r
+Subject: [Patch v4 3/3] restore: transparently support gzipped input\r
+Date: Sun, 30 Mar 2014 14:31:40 -0300\r
+Message-Id: <1396200700-29361-4-git-send-email-david@tethera.net>\r
+X-Mailer: git-send-email 1.9.0\r
+In-Reply-To: <1396200700-29361-1-git-send-email-david@tethera.net>\r
+References: <1396200700-29361-1-git-send-email-david@tethera.net>\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+       <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Sun, 30 Mar 2014 17:32:08 -0000\r
+\r
+We rely completely on zlib to do the right thing in detecting gzipped\r
+input. Since our dump format is chosen to be 7 bit ascii, this should\r
+be fine.\r
+---\r
+ notmuch-restore.c         | 37 +++++++++++++++++++++----------------\r
+ test/T240-dump-restore.sh | 14 ++++++++++++++\r
+ 2 files changed, 35 insertions(+), 16 deletions(-)\r
+\r
+diff --git a/notmuch-restore.c b/notmuch-restore.c\r
+index c54d513..86bce20 100644\r
+--- a/notmuch-restore.c\r
++++ b/notmuch-restore.c\r
+@@ -22,6 +22,7 @@\r
+ #include "hex-escape.h"\r
+ #include "tag-util.h"\r
+ #include "string-util.h"\r
++#include "zlib-extra.h"\r
+ \r
+ static regex_t regex;\r
+ \r
+@@ -128,7 +129,7 @@ notmuch_restore_command (notmuch_config_t *config, int argc, char *argv[])\r
+     tag_op_list_t *tag_ops;\r
+ \r
+     char *input_file_name = NULL;\r
+-    FILE *input = stdin;\r
++    gzFile input;\r
+     char *line = NULL;\r
+     void *line_ctx = NULL;\r
+     size_t line_size;\r
+@@ -163,13 +164,15 @@ notmuch_restore_command (notmuch_config_t *config, int argc, char *argv[])\r
+     if (! accumulate)\r
+       flags |= TAG_FLAG_REMOVE_ALL;\r
+ \r
+-    if (input_file_name) {\r
+-      input = fopen (input_file_name, "r");\r
+-      if (input == NULL) {\r
+-          fprintf (stderr, "Error opening %s for reading: %s\n",\r
+-                   input_file_name, strerror (errno));\r
+-          return EXIT_FAILURE;\r
+-      }\r
++    if (input_file_name)\r
++      input = gzopen (input_file_name, "r");\r
++    else\r
++      input = gzdopen (fileno (stdin), "r");\r
++\r
++    if (input == NULL) {\r
++      fprintf (stderr, "Error opening %s for (gzip) reading: %s\n",\r
++               input_file_name ? input_file_name : "stdin", strerror (errno));\r
++      return EXIT_FAILURE;\r
+     }\r
+ \r
+     if (opt_index < argc) {\r
+@@ -184,12 +187,17 @@ notmuch_restore_command (notmuch_config_t *config, int argc, char *argv[])\r
+     }\r
+ \r
+     do {\r
+-      line_len = getline (&line, &line_size, input);\r
++      util_status_t status;\r
++\r
++      status = gz_getline (line_ctx, &line, &line_size, &line_len, input);\r
+ \r
+       /* empty input file not considered an error */\r
+-      if (line_len < 0)\r
++      if (status == UTIL_EOF)\r
+           return EXIT_SUCCESS;\r
+ \r
++      if (status)\r
++          return EXIT_FAILURE;\r
++\r
+     } while ((line_len == 0) ||\r
+            (line[0] == '#') ||\r
+            /* the cast is safe because we checked about for line_len < 0 */\r
+@@ -254,7 +262,7 @@ notmuch_restore_command (notmuch_config_t *config, int argc, char *argv[])\r
+       if (ret)\r
+           break;\r
+ \r
+-    }  while ((line_len = getline (&line, &line_size, input)) != -1);\r
++    }  while (gz_getline (line_ctx, &line, &line_size, &line_len, input) == UTIL_SUCCESS);\r
+ \r
+     if (line_ctx != NULL)\r
+       talloc_free (line_ctx);\r
+@@ -262,13 +270,10 @@ notmuch_restore_command (notmuch_config_t *config, int argc, char *argv[])\r
+     if (input_format == DUMP_FORMAT_SUP)\r
+       regfree (&regex);\r
+ \r
+-    if (line)\r
+-      free (line);\r
+-\r
+     notmuch_database_destroy (notmuch);\r
+ \r
+-    if (input != stdin)\r
+-      fclose (input);\r
++    if (input_file_name != NULL)\r
++      gzclose_r (input);\r
+ \r
+     return ret ? EXIT_FAILURE : EXIT_SUCCESS;\r
+ }\r
+diff --git a/test/T240-dump-restore.sh b/test/T240-dump-restore.sh\r
+index d79aca8..50d4d48 100755\r
+--- a/test/T240-dump-restore.sh\r
++++ b/test/T240-dump-restore.sh\r
+@@ -80,6 +80,20 @@ notmuch dump --gzip --output=dump-gzip-outfile.gz\r
+ gunzip dump-gzip-outfile.gz\r
+ test_expect_equal_file dump.expected dump-gzip-outfile\r
+ \r
++test_begin_subtest "restoring gzipped stdin"\r
++notmuch dump --gzip --output=backup.gz\r
++notmuch tag +new_tag '*'\r
++notmuch restore < backup.gz\r
++notmuch dump --output=dump.actual\r
++test_expect_equal_file dump.expected dump.actual\r
++\r
++test_begin_subtest "restoring gzipped file"\r
++notmuch dump --gzip --output=backup.gz\r
++notmuch tag +new_tag '*'\r
++notmuch restore --input=backup.gz\r
++notmuch dump --output=dump.actual\r
++test_expect_equal_file dump.expected dump.actual\r
++\r
+ # Note, we assume all messages from cworth have a message-id\r
+ # containing cworth.org\r
+ \r
+-- \r
+1.9.0\r
+\r