1 Return-Path: <bremner@tethera.net>
\r
2 X-Original-To: notmuch@notmuchmail.org
\r
3 Delivered-To: notmuch@notmuchmail.org
\r
4 Received: from localhost (localhost [127.0.0.1])
\r
5 by olra.theworths.org (Postfix) with ESMTP id A2202431FC9
\r
6 for <notmuch@notmuchmail.org>; Fri, 14 Dec 2012 05:34:55 -0800 (PST)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]
\r
13 Received: from olra.theworths.org ([127.0.0.1])
\r
14 by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
\r
15 with ESMTP id SBHk3L9TygaG for <notmuch@notmuchmail.org>;
\r
16 Fri, 14 Dec 2012 05:34:54 -0800 (PST)
\r
17 Received: from tesseract.cs.unb.ca (tesseract.cs.unb.ca [131.202.240.238])
\r
18 (using TLSv1 with cipher AES256-SHA (256/256 bits))
\r
19 (No client certificate requested)
\r
20 by olra.theworths.org (Postfix) with ESMTPS id 8482F431FD2
\r
21 for <notmuch@notmuchmail.org>; Fri, 14 Dec 2012 05:34:52 -0800 (PST)
\r
22 Received: from fctnnbsc30w-142167090129.dhcp-dynamic.fibreop.nb.bellaliant.net
\r
23 ([142.167.90.129] helo=zancas.localnet)
\r
24 by tesseract.cs.unb.ca with esmtpsa
\r
25 (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.72)
\r
26 (envelope-from <bremner@tethera.net>)
\r
27 id 1TjVPf-0004yk-KX; Fri, 14 Dec 2012 09:34:52 -0400
\r
28 Received: from bremner by zancas.localnet with local (Exim 4.80)
\r
29 (envelope-from <bremner@tethera.net>)
\r
30 id 1TjVPa-00022D-42; Fri, 14 Dec 2012 09:34:46 -0400
\r
31 From: david@tethera.net
\r
32 To: notmuch@notmuchmail.org
\r
33 Subject: [Patch v7 05/14] quote_and_decode_query: new function to quote
\r
35 Date: Fri, 14 Dec 2012 09:34:13 -0400
\r
36 Message-Id: <1355492062-7546-6-git-send-email-david@tethera.net>
\r
37 X-Mailer: git-send-email 1.7.10.4
\r
38 In-Reply-To: <1355492062-7546-1-git-send-email-david@tethera.net>
\r
39 References: <1355492062-7546-1-git-send-email-david@tethera.net>
\r
41 Cc: David Bremner <bremner@debian.org>
\r
42 X-BeenThere: notmuch@notmuchmail.org
\r
43 X-Mailman-Version: 2.1.13
\r
45 List-Id: "Use and development of the notmuch mail system."
\r
46 <notmuch.notmuchmail.org>
\r
47 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
48 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
49 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
50 List-Post: <mailto:notmuch@notmuchmail.org>
\r
51 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
52 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
53 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
54 X-List-Received-Date: Fri, 14 Dec 2012 13:34:56 -0000
\r
56 From: David Bremner <bremner@debian.org>
\r
58 The query is split into tokens, with ' ' and ':' as delimiters. Any
\r
59 token containing some hex-escaped character is quoted according to
\r
60 Xapian rules. This maps id:foo%20%22bar to id:"foo ""bar".
\r
61 This intentionally does not quote prefixes, so they still work as prefixes.
\r
63 tag-util.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++
\r
64 1 file changed, 50 insertions(+)
\r
66 diff --git a/tag-util.c b/tag-util.c
\r
67 index f89669a..e1181f8 100644
\r
70 @@ -56,6 +56,56 @@ illegal_tag (const char *tag, notmuch_bool_t remove)
\r
74 +static tag_parse_status_t
\r
75 +quote_and_decode_query (void *ctx, char *encoded, const char *line_for_error,
\r
76 + char **query_string)
\r
78 + char *tok = encoded;
\r
79 + size_t tok_len = 0;
\r
81 + size_t buf_len = 0;
\r
82 + tag_parse_status_t ret = TAG_PARSE_SUCCESS;
\r
84 + *query_string = talloc_strdup (ctx, "");
\r
86 + while (*query_string &&
\r
87 + (tok = strtok_len (tok + tok_len, ": ", &tok_len)) != NULL) {
\r
88 + char delim = tok[tok_len];
\r
90 + *(tok + tok_len++) = '\0';
\r
92 + if (strcspn (tok, "%") < tok_len - 1) {
\r
93 + /* something to decode */
\r
94 + if (hex_decode_inplace (tok) != HEX_SUCCESS) {
\r
95 + ret = line_error (TAG_PARSE_INVALID, line_for_error,
\r
96 + "hex decoding of token '%s' failed", tok);
\r
100 + if (double_quote_str (ctx, tok, &buf, &buf_len)) {
\r
101 + ret = line_error (TAG_PARSE_OUT_OF_MEMORY,
\r
102 + line_for_error, "aborting");
\r
105 + *query_string = talloc_asprintf_append_buffer (
\r
106 + *query_string, "%s%c", buf, delim);
\r
109 + /* This is not just an optimization, but used to preserve
\r
110 + * prefixes like id:, which cannot be quoted.
\r
112 + *query_string = talloc_asprintf_append_buffer (
\r
113 + *query_string, "%s%c", tok, delim);
\r
119 + if (ret != TAG_PARSE_SUCCESS && *query_string)
\r
120 + talloc_free (*query_string);
\r
125 parse_tag_line (void *ctx, char *line,
\r
126 tag_op_flag_t flags,
\r