[PATCH v2 03/14] cli/reply: reuse show_reply_headers() in headers-only format

diff --git a/f3/7cedffb10d21d40d05d7e44f42ae4ddbc7950f b/f3/7cedffb10d21d40d05d7e44f42ae4ddbc7950f
new file mode 100644 (file)
index 0000000..49027f7
--- /dev/null
+++ b/f3/7cedffb10d21d40d05d7e44f42ae4ddbc7950f
@@ -0,0 +1,114 @@
+Return-Path: <jani@nikula.org>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+ by arlo.cworth.org (Postfix) with ESMTP id 4875C6DE39A1\r
+ for <notmuch@notmuchmail.org>; Sat, 13 Aug 2016 04:39:22 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at cworth.org\r
+X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References"\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.573\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.573 tagged_above=-999 required=5 tests=[AWL=0.147,\r
+  DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_LOW=-0.7,\r
+ RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01] autolearn=disabled\r
+Received: from arlo.cworth.org ([127.0.0.1])\r
+ by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024)\r
+ with ESMTP id i_mW_eNHn896 for <notmuch@notmuchmail.org>;\r
+ Sat, 13 Aug 2016 04:39:14 -0700 (PDT)\r
+Received: from mail-wm0-f67.google.com (mail-wm0-f67.google.com\r
+ [74.125.82.67]) by arlo.cworth.org (Postfix) with ESMTPS id 03A8E6DE38C5 for\r
+ <notmuch@notmuchmail.org>; Sat, 13 Aug 2016 04:39:08 -0700 (PDT)\r
+Received: by mail-wm0-f67.google.com with SMTP id o80so2031959wme.0\r
+ for <notmuch@notmuchmail.org>; Sat, 13 Aug 2016 04:39:07 -0700 (PDT)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;\r
+ d=nikula-org.20150623.gappssmtp.com; s=20150623;\r
+ h=from:to:cc:subject:date:message-id:in-reply-to:references\r
+ :in-reply-to:references;\r
+ bh=GFqnarJmTYg+4pHdwcGqpO6WWa2zlvunnPT4GDJLQjM=;\r
+ b=PxAhEegsI9qof1Z2SHmjl1i3R6UAR0ldRIYk03MQbNFG9e7EEw+80KMBZU2qPoe38j\r
+ fQzbDUZTrR2PuaI4syb5eW6zGrrcCdcIufcvcVidtuhrljQGEppDEuqVnu8aGVIh7AzU\r
+ 9QWB7HVVKykerttfzMIrhnNGu9ubUUs1Hia+WnvbG2sPf3i64JtSjYyuzH8nKNWvQAnC\r
+ wH6/e0gjlgLbIyEITcVv66M/3yJv5OkQojtWl5DOHm0F0EWeYFTGJNYjy/8yma+q79DN\r
+ JKtZeYP5cMjwlVrTLmBUeRN59Dv2/Wm4vkhZA7pcVL7h3L/0xI4PavgTlvOIxmpxGXoG\r
+ ZNOA==\r
+X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;\r
+ d=1e100.net; s=20130820;\r
+ h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\r
+ :references:in-reply-to:references;\r
+ bh=GFqnarJmTYg+4pHdwcGqpO6WWa2zlvunnPT4GDJLQjM=;\r
+ b=heukTrw+vCHLjBuUvSCfQIRdy5tpTJIxkBwNgQguenAmA4Mct3j40vkTqu8ECFA8VJ\r
+ DUFwnofqPgIDGKmOGt9TyuwK8hzR+VyKQBNXYSpmL+a46TyOcEVEkV+BeVfEfs1ol1ZQ\r
+ OLhGtWJDc91NEHLSaIz4E/taREY8pBtNyNSDNUPC4ZrUyD2Ciay+ZA0FpzEW/cLzIoqh\r
+ fS64UcbSNIal4M8/fa4R5UUOu+YoH8TwS894yUtzD51XE2VZ56ozRwHF2upf3h4P/bMy\r
+ Y9vjc3p5WFkbo3bb8HbljnEAUJN7TSHxaYWnqmPMyLQ54TwrwQUzmtBmoYQ3mQEIJlWW\r
+ L9Mw==\r
+X-Gm-Message-State:\r
+ AEkooutzg4iMc8WhZsc+ozQ7Ev8G0RnyM1eiy2EgtdCVf16M0VUMbBzXaBCEo6/OoeNnKw==\r
+X-Received: by 10.194.7.100 with SMTP id i4mr23784534wja.154.1471088346661;\r
+ Sat, 13 Aug 2016 04:39:06 -0700 (PDT)\r
+Received: from localhost (mobile-access-bcee63-250.dhcp.inet.fi.\r
+ [188.238.99.250])\r
+ by smtp.gmail.com with ESMTPSA id d8sm6841846wmi.0.2016.08.13.04.39.05\r
+ (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\r
+ Sat, 13 Aug 2016 04:39:06 -0700 (PDT)\r
+From: Jani Nikula <jani@nikula.org>\r
+To: notmuch@notmuchmail.org\r
+Cc: Daniel Kahn Gillmor <dkg@fifthhorseman.net>,\r
+       jani@nikula.org\r
+Subject: [PATCH v2 03/14] cli/reply: reuse show_reply_headers() in\r
+ headers-only format\r
+Date: Sat, 13 Aug 2016 14:37:27 +0300\r
+Message-Id:\r
+ <1f1bb304e0fceef19fd9822c14bafd4c86420882.1471088022.git.jani@nikula.org>\r
+X-Mailer: git-send-email 2.1.4\r
+In-Reply-To: <cover.1471088022.git.jani@nikula.org>\r
+References: <cover.1471088022.git.jani@nikula.org>\r
+In-Reply-To: <cover.1471088022.git.jani@nikula.org>\r
+References: <cover.1471088022.git.jani@nikula.org>\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.20\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+ <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <https://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: <https://notmuchmail.org/mailman/listinfo/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Sat, 13 Aug 2016 11:39:22 -0000\r
+\r
+Align the code with default format reply. There should be no changes\r
+in output.\r
+---\r
+ notmuch-reply.c | 5 +----\r
+ 1 file changed, 1 insertion(+), 4 deletions(-)\r
+\r
+diff --git a/notmuch-reply.c b/notmuch-reply.c\r
+index 847e306f94d2..5adbab624ad7 100644\r
+--- a/notmuch-reply.c\r
++++ b/notmuch-reply.c\r
+@@ -668,7 +668,6 @@ notmuch_reply_format_headers_only(void *ctx,\r
+ {\r
+     GMimeMessage *reply;\r
+     const char *in_reply_to, *orig_references, *references;\r
+-    char *reply_headers;\r
+ \r
+     /* The 0 means we do not want headers in a "pretty" order. */\r
+     reply = g_mime_message_new (0);\r
+@@ -697,9 +696,7 @@ notmuch_reply_format_headers_only(void *ctx,\r
+ \r
+     (void)add_recipients_from_message (reply, config, message, reply_all);\r
+ \r
+-    reply_headers = g_mime_object_to_string (GMIME_OBJECT (reply));\r
+-    printf ("%s", reply_headers);\r
+-    free (reply_headers);\r
++    show_reply_headers (reply);\r
+ \r
+     g_object_unref (G_OBJECT (reply));\r
+ \r
+-- \r
+2.1.4\r
+\r