[PATCH 05/13] reply: Create a JSON sprinter

diff --git a/36/7a6907da4b1f7408733ba39e227c8ad4262266 b/36/7a6907da4b1f7408733ba39e227c8ad4262266
new file mode 100644 (file)
index 0000000..aeb4b81
--- /dev/null
+++ b/36/7a6907da4b1f7408733ba39e227c8ad4262266
@@ -0,0 +1,108 @@
+Return-Path: <amdragon@mit.edu>\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 E2401431FAE\r
+       for <notmuch@notmuchmail.org>; Tue, 24 Jul 2012 19:35:17 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.7\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
+       tests=[RCVD_IN_DNSWL_LOW=-0.7] 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 4Z-QBJevFiOm for <notmuch@notmuchmail.org>;\r
+       Tue, 24 Jul 2012 19:35:15 -0700 (PDT)\r
+Received: from dmz-mailsec-scanner-6.mit.edu (DMZ-MAILSEC-SCANNER-6.MIT.EDU\r
+       [18.7.68.35])\r
+       by olra.theworths.org (Postfix) with ESMTP id 9FE32431FDE\r
+       for <notmuch@notmuchmail.org>; Tue, 24 Jul 2012 19:35:06 -0700 (PDT)\r
+X-AuditID: 12074423-b7f396d0000008f4-b6-500f5b59c105\r
+Received: from mailhub-auth-1.mit.edu ( [18.9.21.35])\r
+       by dmz-mailsec-scanner-6.mit.edu (Symantec Messaging Gateway) with SMTP\r
+       id C5.19.02292.95B5F005; Tue, 24 Jul 2012 22:35:05 -0400 (EDT)\r
+Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])\r
+       by mailhub-auth-1.mit.edu (8.13.8/8.9.2) with ESMTP id q6P2Z4XD011169; \r
+       Tue, 24 Jul 2012 22:35:04 -0400\r
+Received: from drake.dyndns.org\r
+       (209-6-116-242.c3-0.arl-ubr1.sbo-arl.ma.cable.rcn.com\r
+       [209.6.116.242]) (authenticated bits=0)\r
+       (User authenticated as amdragon@ATHENA.MIT.EDU)\r
+       by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id q6P2Z287025122\r
+       (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
+       Tue, 24 Jul 2012 22:35:04 -0400 (EDT)\r
+Received: from amthrax by drake.dyndns.org with local (Exim 4.77)\r
+       (envelope-from <amdragon@mit.edu>)\r
+       id 1StrRG-0004Zp-CW; Tue, 24 Jul 2012 22:35:02 -0400\r
+From: Austin Clements <amdragon@MIT.EDU>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 05/13] reply: Create a JSON sprinter\r
+Date: Tue, 24 Jul 2012 22:34:45 -0400\r
+Message-Id: <1343183693-17134-6-git-send-email-amdragon@mit.edu>\r
+X-Mailer: git-send-email 1.7.10\r
+In-Reply-To: <1343183693-17134-1-git-send-email-amdragon@mit.edu>\r
+References: <1343183693-17134-1-git-send-email-amdragon@mit.edu>\r
+X-Brightmail-Tracker:\r
+ H4sIAAAAAAAAA+NgFtrNIsWRmVeSWpSXmKPExsUixCmqrBsZzR9gcPUMu8XehnZGi+s3ZzI7\r
+       MHks3rSfzePZqlvMAUxRXDYpqTmZZalF+nYJXBknbkxjLLjFXvHp7RHmBsYOti5GTg4JAROJ\r
+       PQuWskDYYhIX7q0HinNxCAnsY5S4On8bI0hCSGADo8TxDi2IxCMmib0XfzJDOHMZJZ51XgIb\r
+       xSagIbFt/3KwDhEBaYmdd2ezgtjMAmYSc39OBKrh4BAGWrdhZwFImEVAVeLdus+MIGFeAQeJ\r
+       K0+gDpKXeHq/D8zmFHCUOL9kIdQNDhI9i6+xT2DkX8DIsIpRNiW3Sjc3MTOnODVZtzg5MS8v\r
+       tUjXTC83s0QvNaV0EyMojNhdlHcw/jmodIhRgINRiYf31xO+ACHWxLLiytxDjJIcTEqivBXB\r
+       /AFCfEn5KZUZicUZ8UWlOanFhxglOJiVRHiLwoByvCmJlVWpRfkwKWkOFiVx3mspN/2FBNIT\r
+       S1KzU1MLUotgsjIcHEoSvK1RQI2CRanpqRVpmTklCGkmDk6Q4TxAw3eD1PAWFyTmFmemQ+RP\r
+       MSpKifNeBUkIgCQySvPgemFx/opRHOgVYYh2HmCKgOt+BTSYCWjw8zA+kMEliQgpqQZGx7Jv\r
+       DAGzL5kLJn2YUWA1u7J2eTSTZGaXd6z62d5n63UdH03fnZGQMLONR6o6rU3KqO5utNR74XfX\r
+       zJJ++pVdO9jsudru/9vaNu+/zrNmpE1Wu/BFfeo7zVVLw+SVTZ3jYm20v7b0aOUbTvIMvD9b\r
+       MMKar2yt0yp2Kc2YeZo8LVp9KzZ0fVNiKc5INNRiLipOBAAEp8RYzgIAAA==\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: Wed, 25 Jul 2012 02:35:18 -0000\r
+\r
+---\r
+ notmuch-reply.c |    4 ++++\r
+ 1 file changed, 4 insertions(+)\r
+\r
+diff --git a/notmuch-reply.c b/notmuch-reply.c\r
+index de21f3b..e42ba79 100644\r
+--- a/notmuch-reply.c\r
++++ b/notmuch-reply.c\r
+@@ -22,6 +22,7 @@\r
+ \r
+ #include "notmuch-client.h"\r
+ #include "gmime-filter-headers.h"\r
++#include "sprinter.h"\r
+ \r
+ static void\r
+ show_reply_headers (GMimeMessage *message)\r
+@@ -596,6 +597,7 @@ notmuch_reply_format_json(void *ctx,\r
+     notmuch_messages_t *messages;\r
+     notmuch_message_t *message;\r
+     mime_node_t *node;\r
++    sprinter_t *sp;\r
+ \r
+     if (notmuch_query_count_messages (query) != 1) {\r
+       fprintf (stderr, "Error: search term did not match precisely one message.\n");\r
+@@ -611,6 +613,8 @@ notmuch_reply_format_json(void *ctx,\r
+     if (!reply)\r
+       return 1;\r
+ \r
++    sp = sprinter_json_create (ctx, stdout);\r
++\r
+     /* The headers of the reply message we've created */\r
+     printf ("{\"reply-headers\": ");\r
+     format_headers_json (ctx, reply, TRUE);\r
+-- \r
+1.7.10\r
+\r