--- /dev/null
+Return-Path: <m.walters@qmul.ac.uk>\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 20623431FB6\r
+ for <notmuch@notmuchmail.org>; Sat, 15 Dec 2012 09:50:05 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -1.098\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-1.098 tagged_above=-999 required=5\r
+ tests=[DKIM_ADSP_CUSTOM_MED=0.001, FREEMAIL_FROM=0.001,\r
+ NML_ADSP_CUSTOM_MED=1.2, RCVD_IN_DNSWL_MED=-2.3] 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 kK3xDGp7cipu for <notmuch@notmuchmail.org>;\r
+ Sat, 15 Dec 2012 09:50:01 -0800 (PST)\r
+Received: from mail2.qmul.ac.uk (mail2.qmul.ac.uk [138.37.6.6])\r
+ (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))\r
+ (No client certificate requested)\r
+ by olra.theworths.org (Postfix) with ESMTPS id 28925431FBC\r
+ for <notmuch@notmuchmail.org>; Sat, 15 Dec 2012 09:50:01 -0800 (PST)\r
+Received: from smtp.qmul.ac.uk ([138.37.6.40])\r
+ by mail2.qmul.ac.uk with esmtp (Exim 4.71)\r
+ (envelope-from <m.walters@qmul.ac.uk>)\r
+ id 1Tjvs2-0004Vc-Gh; Sat, 15 Dec 2012 17:49:56 +0000\r
+Received: from 93-97-24-31.zone5.bethere.co.uk ([93.97.24.31] helo=localhost)\r
+ by smtp.qmul.ac.uk with esmtpsa (TLSv1:AES128-SHA:128) (Exim 4.69)\r
+ (envelope-from <m.walters@qmul.ac.uk>)\r
+ id 1Tjvs2-00001O-3Q; Sat, 15 Dec 2012 17:49:54 +0000\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: david@tethera.net, notmuch@notmuchmail.org\r
+Subject: Re: [Patch v7 05/14] quote_and_decode_query: new function to quote\r
+ hex-decoded queries\r
+In-Reply-To: <1355492062-7546-6-git-send-email-david@tethera.net>\r
+References: <1355492062-7546-1-git-send-email-david@tethera.net>\r
+ <1355492062-7546-6-git-send-email-david@tethera.net>\r
+User-Agent: Notmuch/0.14+155~g7edfdc3 (http://notmuchmail.org) Emacs/23.4.1\r
+ (x86_64-pc-linux-gnu)\r
+Date: Sat, 15 Dec 2012 17:49:55 +0000\r
+Message-ID: <87zk1f8at8.fsf@qmul.ac.uk>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=us-ascii\r
+X-Sender-Host-Address: 93.97.24.31\r
+X-QM-SPAM-Info: Sender has good ham record. :)\r
+X-QM-Body-MD5: 38bb0874714125ffc2484fd026037717 (of first 20000 bytes)\r
+X-SpamAssassin-Score: -1.8\r
+X-SpamAssassin-SpamBar: -\r
+X-SpamAssassin-Report: The QM spam filters have analysed this message to\r
+ determine if it is\r
+ spam. We require at least 5.0 points to mark a message as spam.\r
+ This message scored -1.8 points.\r
+ Summary of the scoring: \r
+ * -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at http://www.dnswl.org/,\r
+ * medium trust\r
+ * [138.37.6.40 listed in list.dnswl.org]\r
+ * 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail\r
+ provider * (markwalters1009[at]gmail.com)\r
+ * 0.5 AWL AWL: From: address is in the auto white-list\r
+X-QM-Scan-Virus: ClamAV says the message is clean\r
+Cc: David Bremner <bremner@debian.org>\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, 15 Dec 2012 17:50:05 -0000\r
+\r
+\r
+On Fri, 14 Dec 2012, david@tethera.net wrote:\r
+> From: David Bremner <bremner@debian.org>\r
+>\r
+> The query is split into tokens, with ' ' and ':' as delimiters. Any\r
+> token containing some hex-escaped character is quoted according to\r
+> Xapian rules. This maps id:foo%20%22bar to id:"foo ""bar".\r
+> This intentionally does not quote prefixes, so they still work as prefixes.\r
+> ---\r
+> tag-util.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++\r
+> 1 file changed, 50 insertions(+)\r
+>\r
+> diff --git a/tag-util.c b/tag-util.c\r
+> index f89669a..e1181f8 100644\r
+> --- a/tag-util.c\r
+> +++ b/tag-util.c\r
+> @@ -56,6 +56,56 @@ illegal_tag (const char *tag, notmuch_bool_t remove)\r
+> return NULL;\r
+> }\r
+> \r
+> +static tag_parse_status_t\r
+> +quote_and_decode_query (void *ctx, char *encoded, const char *line_for_error,\r
+> + char **query_string)\r
+> +{\r
+\r
+Would decode_and_quote_query be a better name given the order these two\r
+happen? Also a comment describing the function would be nice.\r
+\r
+> + char *tok = encoded;\r
+> + size_t tok_len = 0;\r
+> + char *buf = NULL;\r
+> + size_t buf_len = 0;\r
+> + tag_parse_status_t ret = TAG_PARSE_SUCCESS;\r
+> +\r
+> + *query_string = talloc_strdup (ctx, "");\r
+> +\r
+> + while (*query_string &&\r
+> + (tok = strtok_len (tok + tok_len, ": ", &tok_len)) != NULL) {\r
+> + char delim = tok[tok_len];\r
+> +\r
+> + *(tok + tok_len++) = '\0';\r
+\r
+These two look a little odd: I would prefer either array or pointer in\r
+both cases.\r
+\r
+> +\r
+> + if (strcspn (tok, "%") < tok_len - 1) {\r
+> + /* something to decode */\r
+> + if (hex_decode_inplace (tok) != HEX_SUCCESS) {\r
+> + ret = line_error (TAG_PARSE_INVALID, line_for_error,\r
+> + "hex decoding of token '%s' failed", tok);\r
+> + goto DONE;\r
+> + }\r
+> +\r
+> + if (double_quote_str (ctx, tok, &buf, &buf_len)) {\r
+> + ret = line_error (TAG_PARSE_OUT_OF_MEMORY,\r
+> + line_for_error, "aborting");\r
+> + goto DONE;\r
+> + }\r
+> + *query_string = talloc_asprintf_append_buffer (\r
+> + *query_string, "%s%c", buf, delim);\r
+> +\r
+> + } else {\r
+> + /* This is not just an optimization, but used to preserve\r
+> + * prefixes like id:, which cannot be quoted.\r
+> + */\r
+> + *query_string = talloc_asprintf_append_buffer (\r
+> + *query_string, "%s%c", tok, delim);\r
+> + }\r
+\r
+What happens if a message id (for example) contains a ':'? Is a query of\r
+the form \r
+\r
+id:stuff"encoded_stuff" \r
+\r
+acceptable? (As far as I can see from the man page ':' does not need to\r
+be in hex.)\r
+\r
+Best wishes\r
+\r
+Mark\r
+\r
+\r
+> +\r
+> + }\r
+> +\r
+> + DONE:\r
+> + if (ret != TAG_PARSE_SUCCESS && *query_string)\r
+> + talloc_free (*query_string);\r
+> + return ret;\r
+> +}\r
+> +\r
+> tag_parse_status_t\r
+> parse_tag_line (void *ctx, char *line,\r
+> tag_op_flag_t flags,\r
+> -- \r
+> 1.7.10.4\r
+>\r
+> _______________________________________________\r
+> notmuch mailing list\r
+> notmuch@notmuchmail.org\r
+> http://notmuchmail.org/mailman/listinfo/notmuch\r
projects / notmuch-archives.git / commitdiff