--- /dev/null
+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 A8E89429E26\r
+ for <notmuch@notmuchmail.org>; Thu, 2 Aug 2012 18:15: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 M6YOMiHoGwKt for <notmuch@notmuchmail.org>;\r
+ Thu, 2 Aug 2012 18:15:16 -0700 (PDT)\r
+Received: from dmz-mailsec-scanner-7.mit.edu (DMZ-MAILSEC-SCANNER-7.MIT.EDU\r
+ [18.7.68.36])\r
+ by olra.theworths.org (Postfix) with ESMTP id 10452429E37\r
+ for <notmuch@notmuchmail.org>; Thu, 2 Aug 2012 18:15:09 -0700 (PDT)\r
+X-AuditID: 12074424-b7fa06d0000008c2-c8-501b261bab39\r
+Received: from mailhub-auth-4.mit.edu ( [18.7.62.39])\r
+ by dmz-mailsec-scanner-7.mit.edu (Symantec Messaging Gateway) with SMTP\r
+ id E5.5C.02242.B162B105; Thu, 2 Aug 2012 21:15:07 -0400 (EDT)\r
+Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])\r
+ by mailhub-auth-4.mit.edu (8.13.8/8.9.2) with ESMTP id q731F6eq008873; \r
+ Thu, 2 Aug 2012 21:15:06 -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 q731F4Eg002792\r
+ (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
+ Thu, 2 Aug 2012 21:15:05 -0400 (EDT)\r
+Received: from amthrax by drake.dyndns.org with local (Exim 4.77)\r
+ (envelope-from <amdragon@mit.edu>)\r
+ id 1Sx6To-0003wU-Dm; Thu, 02 Aug 2012 21:15:04 -0400\r
+From: Austin Clements <amdragon@MIT.EDU>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v3 09/13] show: Convert non-envelope format_part_json to use\r
+ sprinter\r
+Date: Thu, 2 Aug 2012 21:14:55 -0400\r
+Message-Id: <1343956499-14543-10-git-send-email-amdragon@mit.edu>\r
+X-Mailer: git-send-email 1.7.10\r
+In-Reply-To: <1343956499-14543-1-git-send-email-amdragon@mit.edu>\r
+References: <1343956499-14543-1-git-send-email-amdragon@mit.edu>\r
+X-Brightmail-Tracker:\r
+ H4sIAAAAAAAAA+NgFjrOIsWRmVeSWpSXmKPExsUixG6nriutJh1g0NhvarF6Lo/F9ZszmS3e\r
+ rJzH6sDssXPWXXaPw18Xsng8W3WLOYA5issmJTUnsyy1SN8ugSvj1JvHLAUblSqa/55iamCc\r
+ KN3FyMkhIWAi8eXxQmYIW0ziwr31bF2MXBxCAvsYJSaffMQI4axnlLj5/gOU85BJ4v+F26wQ\r
+ zlxGiUkrJzKC9LMJaEhs278czBYRkJbYeXc2K4jNLBAnsWXKf7C4sECoxKTF/8D2sQioShx4\r
+ /w6shlfAUWLhtStQd8hLPL3fxwZicwLFX799BdYrJOAgsbytm3UCI/8CRoZVjLIpuVW6uYmZ\r
+ OcWpybrFyYl5ealFuuZ6uZkleqkppZsYweHlorKDsfmQ0iFGAQ5GJR5eI0npACHWxLLiytxD\r
+ jJIcTEqivMxKQCG+pPyUyozE4oz4otKc1OJDjBIczEoivFVLpAKEeFMSK6tSi/JhUtIcLEri\r
+ vNdTbvoLCaQnlqRmp6YWpBbBZGU4OJQkeINVgYYKFqWmp1akZeaUIKSZODhBhvMADbcHqeEt\r
+ LkjMLc5Mh8ifYlSUEudNB0kIgCQySvPgemHx/4pRHOgVYV4vkCoeYOqA634FNJgJaLCdGcjV\r
+ xSWJCCmpBsayRpvM3rC9nIwaC54U33yuF5MQ5dFutmfroftHNLIE9l3KPNd8LsV1/aN6A+tr\r
+ NmJcr+6yJJ1byPzR6MO979MkBeYulLFZPm3BMeku+WVHq26FVJqk5a8v/NW9y26R03x+NzER\r
+ 9i8quzameyrMbfxg47C5ytvs8GeduawKDFLPLljFrgro26XEUpyRaKjFXFScCADd37zY2gIA AA==\r
+Cc: tomi.ollila@iki.fi\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: Fri, 03 Aug 2012 01:15:18 -0000\r
+\r
+---\r
+ notmuch-show.c | 74 +++++++++++++++++++++++++++++++++++---------------------\r
+ 1 file changed, 46 insertions(+), 28 deletions(-)\r
+\r
+diff --git a/notmuch-show.c b/notmuch-show.c\r
+index 3ff32df..afbd9d0 100644\r
+--- a/notmuch-show.c\r
++++ b/notmuch-show.c\r
+@@ -588,7 +588,6 @@ format_part_json (const void *ctx, sprinter_t *sp, mime_node_t *node,\r
+ return;\r
+ }\r
+ \r
+- void *local = talloc_new (ctx);\r
+ /* The disposition and content-type metadata are associated with\r
+ * the envelope for message parts */\r
+ GMimeObject *meta = node->envelope_part ?\r
+@@ -597,31 +596,41 @@ format_part_json (const void *ctx, sprinter_t *sp, mime_node_t *node,\r
+ const char *cid = g_mime_object_get_content_id (meta);\r
+ const char *filename = GMIME_IS_PART (node->part) ?\r
+ g_mime_part_get_filename (GMIME_PART (node->part)) : NULL;\r
+- const char *terminator = "";\r
++ int nclose = 0;\r
+ int i;\r
+ \r
+- if (!first)\r
+- printf (", ");\r
++ sp->begin_map (sp);\r
+ \r
+- printf ("{\"id\": %d", node->part_num);\r
++ sp->map_key (sp, "id");\r
++ sp->integer (sp, node->part_num);\r
+ \r
+- if (node->decrypt_attempted)\r
+- printf (", \"encstatus\": [{\"status\": \"%s\"}]",\r
+- node->decrypt_success ? "good" : "bad");\r
++ if (node->decrypt_attempted) {\r
++ sp->map_key (sp, "encstatus");\r
++ sp->begin_list (sp);\r
++ sp->begin_map (sp);\r
++ sp->map_key (sp, "status");\r
++ sp->string (sp, node->decrypt_success ? "good" : "bad");\r
++ sp->end (sp);\r
++ sp->end (sp);\r
++ }\r
+ \r
+ if (node->verify_attempted) {\r
+- printf (", \"sigstatus\": ");\r
++ sp->map_key (sp, "sigstatus");\r
+ format_part_sigstatus_json (sp, node);\r
+ }\r
+ \r
+- printf (", \"content-type\": %s",\r
+- json_quote_str (local, g_mime_content_type_to_string (content_type)));\r
++ sp->map_key (sp, "content-type");\r
++ sp->string (sp, g_mime_content_type_to_string (content_type));\r
+ \r
+- if (cid)\r
+- printf (", \"content-id\": %s", json_quote_str (local, cid));\r
++ if (cid) {\r
++ sp->map_key (sp, "content-id");\r
++ sp->string (sp, cid);\r
++ }\r
+ \r
+- if (filename)\r
+- printf (", \"filename\": %s", json_quote_str (local, filename));\r
++ if (filename) {\r
++ sp->map_key (sp, "filename");\r
++ sp->string (sp, filename);\r
++ }\r
+ \r
+ if (GMIME_IS_PART (node->part)) {\r
+ /* For non-HTML text parts, we include the content in the\r
+@@ -636,35 +645,44 @@ format_part_json (const void *ctx, sprinter_t *sp, mime_node_t *node,\r
+ if (g_mime_content_type_is_type (content_type, "text", "html")) {\r
+ const char *content_charset = g_mime_object_get_content_type_parameter (meta, "charset");\r
+ \r
+- if (content_charset != NULL)\r
+- printf (", \"content-charset\": %s", json_quote_str (local, content_charset));\r
++ if (content_charset != NULL) {\r
++ sp->map_key (sp, "content-charset");\r
++ sp->string (sp, content_charset);\r
++ }\r
+ } else if (g_mime_content_type_is_type (content_type, "text", "*")) {\r
+ GMimeStream *stream_memory = g_mime_stream_mem_new ();\r
+ GByteArray *part_content;\r
+ show_text_part_content (node->part, stream_memory, 0);\r
+ part_content = g_mime_stream_mem_get_byte_array (GMIME_STREAM_MEM (stream_memory));\r
+-\r
+- printf (", \"content\": %s", json_quote_chararray (local, (char *) part_content->data, part_content->len));\r
++ sp->map_key (sp, "content");\r
++ sp->string_len (sp, (char *) part_content->data, part_content->len);\r
+ g_object_unref (stream_memory);\r
+ }\r
+ } else if (GMIME_IS_MULTIPART (node->part)) {\r
+- printf (", \"content\": [");\r
+- terminator = "]";\r
++ sp->map_key (sp, "content");\r
++ sp->begin_list (sp);\r
++ nclose = 1;\r
+ } else if (GMIME_IS_MESSAGE (node->part)) {\r
+- printf (", \"content\": [{");\r
+- printf ("\"headers\": ");\r
++ sp->map_key (sp, "content");\r
++ sp->begin_list (sp);\r
++ sp->begin_map (sp);\r
++\r
++ sp->map_key (sp, "headers");\r
+ format_headers_json (sp, GMIME_MESSAGE (node->part), FALSE);\r
+ \r
+- printf (", \"body\": [");\r
+- terminator = "]}]";\r
++ sp->map_key (sp, "body");\r
++ sp->begin_list (sp);\r
++ nclose = 3;\r
+ }\r
+ \r
+- talloc_free (local);\r
+-\r
+ for (i = 0; i < node->nchildren; i++)\r
+ format_part_json (ctx, sp, mime_node_child (node, i), i == 0, TRUE);\r
+ \r
+- printf ("%s}", terminator);\r
++ /* Close content structures */\r
++ for (i = 0; i < nclose; i++)\r
++ sp->end (sp);\r
++ /* Close part map */\r
++ sp->end (sp);\r
+ }\r
+ \r
+ static notmuch_status_t\r
+-- \r
+1.7.10\r
+\r
projects / notmuch-archives.git / commitdiff