From: Mark Walters Date: Wed, 25 Jul 2012 18:57:07 +0000 (+0100) Subject: Re: [PATCH 03/13] sprinter: Add a string_len method X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=ee1c7cd1b894a7183414e82be8f2342d8fb43ede;p=notmuch-archives.git Re: [PATCH 03/13] sprinter: Add a string_len method --- diff --git a/b4/2b0ef5467f91f55886866abe1ee358e5b03ac8 b/b4/2b0ef5467f91f55886866abe1ee358e5b03ac8 new file mode 100644 index 000000000..646a4e963 --- /dev/null +++ b/b4/2b0ef5467f91f55886866abe1ee358e5b03ac8 @@ -0,0 +1,203 @@ +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 F1B18431FAF + for ; Wed, 25 Jul 2012 11:57:15 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: -1.098 +X-Spam-Level: +X-Spam-Status: No, score=-1.098 tagged_above=-999 required=5 + tests=[DKIM_ADSP_CUSTOM_MED=0.001, FREEMAIL_FROM=0.001, + NML_ADSP_CUSTOM_MED=1.2, RCVD_IN_DNSWL_MED=-2.3] 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 s+piZPTySxP4 for ; + Wed, 25 Jul 2012 11:57:14 -0700 (PDT) +Received: from mail2.qmul.ac.uk (mail2.qmul.ac.uk [138.37.6.6]) + (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id 1CD36431FAE + for ; Wed, 25 Jul 2012 11:57:14 -0700 (PDT) +Received: from smtp.qmul.ac.uk ([138.37.6.40]) + by mail2.qmul.ac.uk with esmtp (Exim 4.71) + (envelope-from ) + id 1Su6le-00025K-Re; Wed, 25 Jul 2012 19:57:09 +0100 +Received: from 94-192-233-223.zone6.bethere.co.uk ([94.192.233.223] + helo=localhost) + by smtp.qmul.ac.uk with esmtpsa (TLSv1:AES128-SHA:128) (Exim 4.69) + (envelope-from ) + id 1Su6le-0001NX-F7; Wed, 25 Jul 2012 19:57:06 +0100 +From: Mark Walters +To: Austin Clements , notmuch@notmuchmail.org +Subject: Re: [PATCH 03/13] sprinter: Add a string_len method +In-Reply-To: <1343183693-17134-4-git-send-email-amdragon@mit.edu> +References: <1343183693-17134-1-git-send-email-amdragon@mit.edu> + <1343183693-17134-4-git-send-email-amdragon@mit.edu> +User-Agent: Notmuch/0.13.2+93~gf33b188 (http://notmuchmail.org) Emacs/23.4.1 + (x86_64-pc-linux-gnu) +Date: Wed, 25 Jul 2012 19:57:07 +0100 +Message-ID: <87a9ynis8s.fsf@qmul.ac.uk> +MIME-Version: 1.0 +Content-Type: text/plain; charset=us-ascii +X-Sender-Host-Address: 94.192.233.223 +X-QM-SPAM-Info: Sender has good ham record. :) +X-QM-Body-MD5: 0a00e831d3ee6423799d992541306787 (of first 20000 bytes) +X-SpamAssassin-Score: -1.8 +X-SpamAssassin-SpamBar: - +X-SpamAssassin-Report: The QM spam filters have analysed this message to + determine if it is + spam. We require at least 5.0 points to mark a message as spam. + This message scored -1.8 points. + Summary of the scoring: + * -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at http://www.dnswl.org/, + * medium trust + * [138.37.6.40 listed in list.dnswl.org] + * 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail + provider * (markwalters1009[at]gmail.com) + * -0.0 T_RP_MATCHES_RCVD Envelope sender domain matches handover relay + * domain + * 0.5 AWL AWL: From: address is in the auto white-list +X-QM-Scan-Virus: ClamAV says the message is clean +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 18:57:16 -0000 + + +Hi + +I have read this series (apart from the test changes) and it is both +very nice to review and looks good. It builds and all tests pass at all +the interesting partial stages and when fully applied. I have a few very +minor comments. + +On Wed, 25 Jul 2012, Austin Clements wrote: +> This method allows callers to output strings with specific lengths. +> It's useful both for strings with embedded NULs (which JSON can +> represent, though parser support is apparently spotty), and +> non-terminated strings. +> --- +> sprinter-json.c | 11 +++++++++-- +> sprinter-text.c | 11 +++++++++-- +> sprinter.h | 1 + +> 3 files changed, 19 insertions(+), 4 deletions(-) +> +> diff --git a/sprinter-json.c b/sprinter-json.c +> index 4649655..2587ca6 100644 +> --- a/sprinter-json.c +> +++ b/sprinter-json.c +> @@ -89,7 +89,7 @@ json_end (struct sprinter *sp) +> } +> +> static void +> -json_string (struct sprinter *sp, const char *val) +> +json_string_len (struct sprinter *sp, const char *val, size_t len) +> { + +I think this function could do with a comment along the lines of the +commit message. It might be nice to document somewhere where/when we +might actually have nulls in an encoded string (are they allowed in +bodies, headers etc). + +Actually, do we know that the json emacs parser handles nulls correctly? + +Best wishes + +Mark +> static const char *const escapes[] = { +> ['\"'] = "\\\"", ['\\'] = "\\\\", ['\b'] = "\\b", +> @@ -98,7 +98,7 @@ json_string (struct sprinter *sp, const char *val) +> struct sprinter_json *spj = json_begin_value (sp); +> +> fputc ('"', spj->stream); +> - for (; *val; ++val) { +> + for (; len; ++val, --len) { +> unsigned char ch = *val; +> if (ch < ARRAY_SIZE (escapes) && escapes[ch]) +> fputs (escapes[ch], spj->stream); +> @@ -111,6 +111,12 @@ json_string (struct sprinter *sp, const char *val) +> } +> +> static void +> +json_string (struct sprinter *sp, const char *val) +> +{ +> + json_string_len (sp, val, strlen (val)); +> +} +> + +> +static void +> json_integer (struct sprinter *sp, int val) +> { +> struct sprinter_json *spj = json_begin_value (sp); +> @@ -166,6 +172,7 @@ sprinter_json_create (const void *ctx, FILE *stream) +> .begin_list = json_begin_list, +> .end = json_end, +> .string = json_string, +> + .string_len = json_string_len, +> .integer = json_integer, +> .boolean = json_boolean, +> .null = json_null, +> diff --git a/sprinter-text.c b/sprinter-text.c +> index b208840..dfa54b5 100644 +> --- a/sprinter-text.c +> +++ b/sprinter-text.c +> @@ -25,14 +25,20 @@ struct sprinter_text { +> }; +> +> static void +> -text_string (struct sprinter *sp, const char *val) +> +text_string_len (struct sprinter *sp, const char *val, size_t len) +> { +> struct sprinter_text *sptxt = (struct sprinter_text *) sp; +> +> if (sptxt->current_prefix != NULL) +> fprintf (sptxt->stream, "%s:", sptxt->current_prefix); +> +> - fputs(val, sptxt->stream); +> + fwrite (val, len, 1, sptxt->stream); +> +} +> + +> +static void +> +text_string (struct sprinter *sp, const char *val) +> +{ +> + text_string_len (sp, val, strlen (val)); +> } +> +> static void +> @@ -105,6 +111,7 @@ sprinter_text_create (const void *ctx, FILE *stream) +> .begin_list = text_begin_list, +> .end = text_end, +> .string = text_string, +> + .string_len = text_string_len, +> .integer = text_integer, +> .boolean = text_boolean, +> .null = text_null, +> diff --git a/sprinter.h b/sprinter.h +> index 6680d41..826a852 100644 +> --- a/sprinter.h +> +++ b/sprinter.h +> @@ -28,6 +28,7 @@ typedef struct sprinter { +> * For string, the char * must be UTF-8 encoded. +> */ +> void (*string) (struct sprinter *, const char *); +> + void (*string_len) (struct sprinter *, const char *, size_t); +> void (*integer) (struct sprinter *, int); +> void (*boolean) (struct sprinter *, notmuch_bool_t); +> void (*null) (struct sprinter *); +> -- +> 1.7.10 +> +> _______________________________________________ +> notmuch mailing list +> notmuch@notmuchmail.org +> http://notmuchmail.org/mailman/listinfo/notmuch