From a46ded0d8eb07e558e859d6b7a011d43cb394f86 Mon Sep 17 00:00:00 2001 From: Austin Clements Date: Sun, 29 Jul 2012 00:29:09 +2000 Subject: [PATCH] [PATCH v2 08/13] show: Convert format_part_sigstatus_json to use sprinter --- eb/2d9a7be4423d878bf16713e41808d44c2bc608 | 290 ++++++++++++++++++++++ 1 file changed, 290 insertions(+) create mode 100644 eb/2d9a7be4423d878bf16713e41808d44c2bc608 diff --git a/eb/2d9a7be4423d878bf16713e41808d44c2bc608 b/eb/2d9a7be4423d878bf16713e41808d44c2bc608 new file mode 100644 index 000000000..11f84e7ed --- /dev/null +++ b/eb/2d9a7be4423d878bf16713e41808d44c2bc608 @@ -0,0 +1,290 @@ +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 EB92B431FAF + for ; Fri, 27 Jul 2012 21:29:31 -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 aKmhl7AjF5Wp for ; + Fri, 27 Jul 2012 21:29:29 -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 DBF34431FC2 + for ; Fri, 27 Jul 2012 21:29:25 -0700 (PDT) +X-AuditID: 12074423-b7f396d0000008f4-77-50136aa404f4 +Received: from mailhub-auth-4.mit.edu ( [18.7.62.39]) + by dmz-mailsec-scanner-6.mit.edu (Symantec Messaging Gateway) with SMTP + id FB.BC.02292.4AA63105; Sat, 28 Jul 2012 00:29:24 -0400 (EDT) +Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103]) + by mailhub-auth-4.mit.edu (8.13.8/8.9.2) with ESMTP id q6S4TNZn012930; + Sat, 28 Jul 2012 00:29:23 -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 q6S4TKiT027359 + (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT); + Sat, 28 Jul 2012 00:29:22 -0400 (EDT) +Received: from amthrax by drake.dyndns.org with local (Exim 4.77) + (envelope-from ) + id 1SuyeW-0002X2-OA; Sat, 28 Jul 2012 00:29:20 -0400 +From: Austin Clements +To: notmuch@notmuchmail.org +Subject: [PATCH v2 08/13] show: Convert format_part_sigstatus_json to use + sprinter +Date: Sat, 28 Jul 2012 00:29:09 -0400 +Message-Id: <1343449754-9010-9-git-send-email-amdragon@mit.edu> +X-Mailer: git-send-email 1.7.10 +In-Reply-To: <1343449754-9010-1-git-send-email-amdragon@mit.edu> +References: <1343449754-9010-1-git-send-email-amdragon@mit.edu> +X-Brightmail-Tracker: + H4sIAAAAAAAAA+NgFjrPIsWRmVeSWpSXmKPExsUixG6nrrskSzjAYMF6RYu9De2MFqvn8lhc + vzmT2eLNynmsDiweO2fdZfdYvGk/m8fhrwtZPJ6tusUcwBLFZZOSmpNZllqkb5fAlbF51QbW + gkumFZMbVrI0MP7V6GLk5JAQMJGY+76FFcIWk7hwbz1bFyMXh5DAPkaJu9fPMEE4Gxglvu6/ + zwLhPGKSWDr/NDuEM5dRonHWOiaQfjYBDYlt+5czgtgiAtISO+/OBprLwcEskCfxeK0EiCks + ECTx/b0wSAWLgKrEr40H2UBsXgF7iTU/3jBBXCEv8fR+H1icU8BBYvPLD8wgthBQze7JG1gn + MPIvYGRYxSibklulm5uYmVOcmqxbnJyYl5dapGuml5tZopeaUrqJERxuLso7GP8cVDrEKMDB + qMTDq3RdKECINbGsuDL3EKMkB5OSKG9UuHCAEF9SfkplRmJxRnxRaU5q8SFGCQ5mJRHenYJA + Od6UxMqq1KJ8mJQ0B4uSOO+1lJv+QgLpiSWp2ampBalFMFkZDg4lCd7tmUCNgkWp6akVaZk5 + JQhpJg5OkOE8QMMVs0CGFxck5hZnpkPkTzEqSonzSoMkBEASGaV5cL2wdPCKURzoFWFeYZAq + HmAqget+BTSYCWiwRbQQyOCSRISUVANj+lz7l0mTtOJeTwuKu5bHn/Gj6e7vYsOrFVKrfDdu + zw5ybr+e2KN2suLZ6Zp5PWx1KwI5+sOFm5nbr266XbhzDY99v+43r85WU6kO98yZqisPnJ61 + tdLhywJ2jxi2NUHPLybOjbbe/ujFTlmWoD29RXZxqz+IrbdheGv7a04nr2Lqu7SlZ44rsRRn + JBpqMRcVJwIAHSTF8OICAAA= +Cc: tomi.ollila@iki.fi +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: Sat, 28 Jul 2012 04:29:32 -0000 + +--- + notmuch-show.c | 118 +++++++++++++++++++++++++++++--------------------------- + 1 file changed, 61 insertions(+), 57 deletions(-) + +diff --git a/notmuch-show.c b/notmuch-show.c +index 9852119..3ff32df 100644 +--- a/notmuch-show.c ++++ b/notmuch-show.c +@@ -337,134 +337,138 @@ signer_status_to_string (GMimeSignerStatus x) + + #ifdef GMIME_ATLEAST_26 + static void +-format_part_sigstatus_json (mime_node_t *node) ++format_part_sigstatus_json (sprinter_t *sp, mime_node_t *node) + { + GMimeSignatureList *siglist = node->sig_list; + +- printf ("["); ++ sp->begin_list (sp); + + if (!siglist) { +- printf ("]"); ++ sp->end (sp); + return; + } + +- void *ctx_quote = talloc_new (NULL); + int i; + for (i = 0; i < g_mime_signature_list_length (siglist); i++) { + GMimeSignature *signature = g_mime_signature_list_get_signature (siglist, i); + +- if (i > 0) +- printf (", "); +- +- printf ("{"); ++ sp->begin_map (sp); + + /* status */ + GMimeSignatureStatus status = g_mime_signature_get_status (signature); +- printf ("\"status\": %s", +- json_quote_str (ctx_quote, +- signature_status_to_string (status))); ++ sp->map_key (sp, "status"); ++ sp->string (sp, signature_status_to_string (status)); + + GMimeCertificate *certificate = g_mime_signature_get_certificate (signature); + if (status == GMIME_SIGNATURE_STATUS_GOOD) { +- if (certificate) +- printf (", \"fingerprint\": %s", json_quote_str (ctx_quote, g_mime_certificate_get_fingerprint (certificate))); ++ if (certificate) { ++ sp->map_key (sp, "fingerprint"); ++ sp->string (sp, g_mime_certificate_get_fingerprint (certificate)); ++ } + /* these dates are seconds since the epoch; should we + * provide a more human-readable format string? */ + time_t created = g_mime_signature_get_created (signature); +- if (created != -1) +- printf (", \"created\": %d", (int) created); ++ if (created != -1) { ++ sp->map_key (sp, "created"); ++ sp->integer (sp, created); ++ } + time_t expires = g_mime_signature_get_expires (signature); +- if (expires > 0) +- printf (", \"expires\": %d", (int) expires); ++ if (expires > 0) { ++ sp->map_key (sp, "expires"); ++ sp->integer (sp, expires); ++ } + /* output user id only if validity is FULL or ULTIMATE. */ + /* note that gmime is using the term "trust" here, which + * is WRONG. It's actually user id "validity". */ + if (certificate) { + const char *name = g_mime_certificate_get_name (certificate); + GMimeCertificateTrust trust = g_mime_certificate_get_trust (certificate); +- if (name && (trust == GMIME_CERTIFICATE_TRUST_FULLY || trust == GMIME_CERTIFICATE_TRUST_ULTIMATE)) +- printf (", \"userid\": %s", json_quote_str (ctx_quote, name)); ++ if (name && (trust == GMIME_CERTIFICATE_TRUST_FULLY || trust == GMIME_CERTIFICATE_TRUST_ULTIMATE)) { ++ sp->map_key (sp, "userid"); ++ sp->string (sp, name); ++ } + } + } else if (certificate) { + const char *key_id = g_mime_certificate_get_key_id (certificate); +- if (key_id) +- printf (", \"keyid\": %s", json_quote_str (ctx_quote, key_id)); ++ if (key_id) { ++ sp->map_key (sp, "keyid"); ++ sp->string (sp, key_id); ++ } + } + + GMimeSignatureError errors = g_mime_signature_get_errors (signature); + if (errors != GMIME_SIGNATURE_ERROR_NONE) { +- printf (", \"errors\": %d", errors); ++ sp->map_key (sp, "errors"); ++ sp->integer (sp, errors); + } + +- printf ("}"); ++ sp->end (sp); + } + +- printf ("]"); +- +- talloc_free (ctx_quote); ++ sp->end (sp); + } + #else + static void +-format_part_sigstatus_json (mime_node_t *node) ++format_part_sigstatus_json (sprinter_t *sp, mime_node_t *node) + { + const GMimeSignatureValidity* validity = node->sig_validity; + +- printf ("["); ++ sp->begin_list (sp); + + if (!validity) { +- printf ("]"); ++ sp->end (sp); + return; + } + + const GMimeSigner *signer = g_mime_signature_validity_get_signers (validity); +- int first = 1; +- void *ctx_quote = talloc_new (NULL); +- + while (signer) { +- if (first) +- first = 0; +- else +- printf (", "); +- +- printf ("{"); ++ sp->begin_map (sp); + + /* status */ +- printf ("\"status\": %s", +- json_quote_str (ctx_quote, +- signer_status_to_string (signer->status))); ++ sp->map_key (sp, "status"); ++ sp->string (sp, signer_status_to_string (signer->status)); + + if (signer->status == GMIME_SIGNER_STATUS_GOOD) + { +- if (signer->fingerprint) +- printf (", \"fingerprint\": %s", json_quote_str (ctx_quote, signer->fingerprint)); ++ if (signer->fingerprint) { ++ sp->map_key (sp, "fingerprint"); ++ sp->string (sp, signer->fingerprint); ++ } + /* these dates are seconds since the epoch; should we + * provide a more human-readable format string? */ +- if (signer->created) +- printf (", \"created\": %d", (int) signer->created); +- if (signer->expires) +- printf (", \"expires\": %d", (int) signer->expires); ++ if (signer->created) { ++ sp->map_key (sp, "created"); ++ sp->integer (sp, signer->created); ++ } ++ if (signer->expires) { ++ sp->map_key (sp, "expires"); ++ sp->integer (sp, signer->expires); ++ } + /* output user id only if validity is FULL or ULTIMATE. */ + /* note that gmime is using the term "trust" here, which + * is WRONG. It's actually user id "validity". */ + if ((signer->name) && (signer->trust)) { +- if ((signer->trust == GMIME_SIGNER_TRUST_FULLY) || (signer->trust == GMIME_SIGNER_TRUST_ULTIMATE)) +- printf (", \"userid\": %s", json_quote_str (ctx_quote, signer->name)); ++ if ((signer->trust == GMIME_SIGNER_TRUST_FULLY) || (signer->trust == GMIME_SIGNER_TRUST_ULTIMATE)) { ++ sp->map_key (sp, "userid"); ++ sp->string (sp, signer->name); ++ } + } + } else { +- if (signer->keyid) +- printf (", \"keyid\": %s", json_quote_str (ctx_quote, signer->keyid)); ++ if (signer->keyid) { ++ sp->map_key (sp, "keyid"); ++ sp->string (sp, signer->keyid); ++ } + } + if (signer->errors != GMIME_SIGNER_ERROR_NONE) { +- printf (", \"errors\": %d", signer->errors); ++ sp->map_key (sp, "errors"); ++ sp->integer (sp, signer->errors); + } + +- printf ("}"); ++ sp->end (sp); + signer = signer->next; + } + +- printf ("]"); +- +- talloc_free (ctx_quote); ++ sp->end (sp); + } + #endif + +@@ -607,7 +611,7 @@ format_part_json (const void *ctx, sprinter_t *sp, mime_node_t *node, + + if (node->verify_attempted) { + printf (", \"sigstatus\": "); +- format_part_sigstatus_json (node); ++ format_part_sigstatus_json (sp, node); + } + + printf (", \"content-type\": %s", +-- +1.7.10 + -- 2.26.2