--- /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 CA721431FB6\r
+ for <notmuch@notmuchmail.org>; Fri, 27 Jul 2012 21:29:42 -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 YGlnSlrBPbQ8 for <notmuch@notmuchmail.org>;\r
+ Fri, 27 Jul 2012 21:29:40 -0700 (PDT)\r
+Received: from dmz-mailsec-scanner-1.mit.edu (DMZ-MAILSEC-SCANNER-1.MIT.EDU\r
+ [18.9.25.12])\r
+ by olra.theworths.org (Postfix) with ESMTP id 3A49F431FBD\r
+ for <notmuch@notmuchmail.org>; Fri, 27 Jul 2012 21:29:28 -0700 (PDT)\r
+X-AuditID: 1209190c-b7f806d000006b87-71-50136aa76963\r
+Received: from mailhub-auth-1.mit.edu ( [18.9.21.35])\r
+ by dmz-mailsec-scanner-1.mit.edu (Symantec Messaging Gateway) with SMTP\r
+ id 13.00.27527.7AA63105; Sat, 28 Jul 2012 00:29:28 -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 q6S4TRP1017258; \r
+ Sat, 28 Jul 2012 00:29:27 -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 q6S4TK8k027350\r
+ (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
+ Sat, 28 Jul 2012 00:29:22 -0400 (EDT)\r
+Received: from amthrax by drake.dyndns.org with local (Exim 4.77)\r
+ (envelope-from <amdragon@mit.edu>)\r
+ id 1SuyeW-0002Wj-81; Sat, 28 Jul 2012 00:29:20 -0400\r
+From: Austin Clements <amdragon@MIT.EDU>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v2 00/13] Convert notmuch show to use structure printers\r
+Date: Sat, 28 Jul 2012 00:29:01 -0400\r
+Message-Id: <1343449754-9010-1-git-send-email-amdragon@mit.edu>\r
+X-Mailer: git-send-email 1.7.10\r
+X-Brightmail-Tracker:\r
+ H4sIAAAAAAAAA+NgFtrBIsWRmVeSWpSXmKPExsUixCmqrLsiSzjA4MIhRou9De2MFqvn8lhc\r
+ vzmT2eLNynmsDiweO2fdZfdYvGk/m8fhrwtZPJ6tusUcwBLFZZOSmpNZllqkb5fAlXH8wEHG\r
+ gifiFQd3fmBvYPwm1MXIySEhYCKxseUvG4QtJnHh3nogm4tDSGAfo8TdJ8eZIZwNjBJ3Os8w\r
+ QjiPmCQO3LjNDuHMZZRoPDSXBaSfTUBDYtv+5YwgtoiAtMTOu7NZQWxmAUeJu78PA83l4BAW\r
+ 8JBYOzkHJMwioCqxd9M6sHJeAXuJRZ82skKcIS/x9H4f2wRG3gWMDKsYZVNyq3RzEzNzilOT\r
+ dYuTE/PyUot0DfVyM0v0UlNKNzGCA0iSZwfjm4NKhxgFOBiVeHiVrwsFCLEmlhVX5h5ilORg\r
+ UhLljQoXDhDiS8pPqcxILM6ILyrNSS0+xCjBwawkwrtTECjHm5JYWZValA+TkuZgURLnvZxy\r
+ 019IID2xJDU7NbUgtQgmK8PBoSTBuz0TqFGwKDU9tSItM6cEIc3EwQkynAdo+BqQGt7igsTc\r
+ 4sx0iPwpRkUpcd5JIAkBkERGaR5cLyzCXzGKA70izHsNpIoHmBzgul8BDWYCGmwRLQQyuCQR\r
+ ISXVwLj1X2fYhBl3j4RuXP9Dge/jJtdwfUm+So95pV2TF8s9NLq7++H3NVK/XG58YZww/Zel\r
+ PpvAqbYT0usWKicJPd2boVXcx+VqeEC8f8OtJXfNgzXZxXXym2IWf9WumuvqW+c9z7xRU+fP\r
+ 1uzQbZfeJH7tOvg1/K9FzJuaPVN2FEbPswk+tSSEuVGJpTgj0VCLuag4EQAusRsKywIAAA==\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: Sat, 28 Jul 2012 04:29:43 -0000\r
+\r
+This is version 2 of [0]. It adds some comments explaining handling\r
+of NUL bytes in strings and moves a few variable assignments closer to\r
+their uses.\r
+\r
+[0] id:1343183693-17134-1-git-send-email-amdragon@mit.edu\r
+\r
+The diff from version 1 follows. (Note that date was already assigned\r
+where it was used in version 1, in addition to being assigned at the\r
+beginning of format_message_json; hence the diff diff only shows it\r
+being removed).\r
+\r
+diff --git a/notmuch-show.c b/notmuch-show.c\r
+index f5bc098..3556293 100644\r
+--- a/notmuch-show.c\r
++++ b/notmuch-show.c\r
+@@ -105,6 +105,8 @@ _get_one_line_summary (const void *ctx, notmuch_message_t *message)\r
+ from, relative_date, tags);\r
+ }\r
+ \r
++/* Emit a sequence of key/value pairs for the metadata of message.\r
++ * The caller should begin a map before calling this. */\r
+ static void\r
+ format_message_json (sprinter_t *sp, notmuch_message_t *message)\r
+ {\r
+@@ -113,9 +115,6 @@ format_message_json (sprinter_t *sp, notmuch_message_t *message)\r
+ time_t date;\r
+ const char *relative_date;\r
+ \r
+- date = notmuch_message_get_date (message);\r
+- relative_date = notmuch_time_relative_date (local, date);\r
+-\r
+ sp->map_key (sp, "id");\r
+ sp->string (sp, notmuch_message_get_message_id (message));\r
+ \r
+@@ -133,6 +132,7 @@ format_message_json (sprinter_t *sp, notmuch_message_t *message)\r
+ sp->integer (sp, date);\r
+ \r
+ sp->map_key (sp, "date_relative");\r
++ relative_date = notmuch_time_relative_date (local, date);\r
+ sp->string (sp, relative_date);\r
+ \r
+ sp->map_key (sp, "tags");\r
+diff --git a/sprinter-json.c b/sprinter-json.c\r
+index 2587ca6..c9b6835 100644\r
+--- a/sprinter-json.c\r
++++ b/sprinter-json.c\r
+@@ -88,6 +88,11 @@ json_end (struct sprinter *sp)\r
+ fputc ('\n', spj->stream);\r
+ }\r
+ \r
++/* This implementation supports embedded NULs as allowed by the JSON\r
++ * specification and Unicode. Support for *parsing* embedded NULs\r
++ * varies, but is generally not a problem outside of C-based parsers\r
++ * (Python's json module and Emacs' json.el take embedded NULs in\r
++ * stride). */\r
+ static void\r
+ json_string_len (struct sprinter *sp, const char *val, size_t len)\r
+ {\r
+diff --git a/sprinter.h b/sprinter.h\r
+index 826a852..5f43175 100644\r
+--- a/sprinter.h\r
++++ b/sprinter.h\r
+@@ -23,9 +23,11 @@ typedef struct sprinter {\r
+ */\r
+ void (*end) (struct sprinter *);\r
+ \r
+- /* Print one string/integer/boolean/null element (possibly inside a\r
+- * list or map, followed or preceded by separators).\r
+- * For string, the char * must be UTF-8 encoded.\r
++ /* Print one string/integer/boolean/null element (possibly inside\r
++ * a list or map, followed or preceded by separators). For string\r
++ * and string_len, the char * must be UTF-8 encoded. string_len\r
++ * allows non-terminated strings and strings with embedded NULs\r
++ * (though the handling of the latter is format-dependent).\r
+ */\r
+ void (*string) (struct sprinter *, const char *);\r
+ void (*string_len) (struct sprinter *, const char *, size_t);\r
+\r
+\r
projects / notmuch-archives.git / commitdiff