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