--- /dev/null
+Return-Path: <jani@nikula.org>\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 5596B431FBC\r
+ for <notmuch@notmuchmail.org>; Sat, 15 Dec 2012 15:21:14 -0800 (PST)\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 mCffs3Wdg9jU for <notmuch@notmuchmail.org>;\r
+ Sat, 15 Dec 2012 15:21:13 -0800 (PST)\r
+Received: from mail-lb0-f181.google.com (mail-lb0-f181.google.com\r
+ [209.85.217.181]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+ (No client certificate requested)\r
+ by olra.theworths.org (Postfix) with ESMTPS id 90031431FB6\r
+ for <notmuch@notmuchmail.org>; Sat, 15 Dec 2012 15:21:13 -0800 (PST)\r
+Received: by mail-lb0-f181.google.com with SMTP id ge1so3677411lbb.26\r
+ for <notmuch@notmuchmail.org>; Sat, 15 Dec 2012 15:21:12 -0800 (PST)\r
+X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;\r
+ d=google.com; s=20120113;\r
+ h=from:to:cc:subject:in-reply-to:references:user-agent:date\r
+ :message-id:mime-version:content-type:x-gm-message-state;\r
+ bh=MOqD5O13QkhyqjrXlfbSVRQQCwlYc7EV0orGni2VkD0=;\r
+ b=anqjtj8CbbzSKIxitZeMUxhYKNIlvdMD8d84KVKfzPor0GebfbnyD17ay9zxtULHJ/\r
+ 6yPh5TZOviGbHyN1dJZNQY/1tXvkgQ36ZaBmmgOWhiQt5n9bCM2JWDqd8eoKuSFLF2+e\r
+ EgDBlIcq47kT8hbBy44XNNbIQsNfa0tHAwpuLC8Rf8QR9C0+KI8fMWwc0EFVh8IGnmDN\r
+ 5YWjtppFtOHva3NiOa3cDnGSy0L/hFrDFoAuO0D0IOFpYAkdbNR9FxrLNfRtyrMefITj\r
+ LnOo3kOulMPPB3FlrG52Qp4oD/+dOyKGiHyEFJBOGSslh3F8TB/MjG5UKzFvHChXGOtP\r
+ URAA==\r
+Received: by 10.152.114.65 with SMTP id je1mr6640908lab.33.1355613672076;\r
+ Sat, 15 Dec 2012 15:21:12 -0800 (PST)\r
+Received: from localhost (dsl-hkibrasgw4-50df51-27.dhcp.inet.fi.\r
+ [80.223.81.27])\r
+ by mx.google.com with ESMTPS id fb1sm3279699lbb.15.2012.12.15.15.21.10\r
+ (version=SSLv3 cipher=OTHER); Sat, 15 Dec 2012 15:21:11 -0800 (PST)\r
+From: Jani Nikula <jani@nikula.org>\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+138~g7041c56 (http://notmuchmail.org) Emacs/23.4.1\r
+ (i686-pc-linux-gnu)\r
+Date: Sun, 16 Dec 2012 01:21:08 +0200\r
+Message-ID: <87mwxeq4uz.fsf@nikula.org>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=us-ascii\r
+X-Gm-Message-State:\r
+ ALoCoQkUugskuohKOrRftlHv/wUvcjLnxsM49B3UxoB6X5CfSmD6cFsmNI8C2x+C07LMBSzoLhx0\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 23:21:15 -0000\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
+> + 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
+\r
+strtok_len() will eat all the leading delimiters at each call, and will\r
+not return a zero-length token if you have multiple consecutive\r
+delimiters. Which means you may end up losing stuff here. Whether that\r
+matters or not I'm too tired to tell...\r
+\r
+BR,\r
+Jani.\r
+\r
+\r
+> + char delim = tok[tok_len];\r
+> +\r
+> + *(tok + tok_len++) = '\0';\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
+> + }\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