1 Return-Path: <amdragon@mit.edu>
\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 8EE61431FBF
\r
6 for <notmuch@notmuchmail.org>; Tue, 25 Dec 2012 19:49:00 -0800 (PST)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5
\r
12 tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled
\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 deUZlYMmh2AO for <notmuch@notmuchmail.org>;
\r
16 Tue, 25 Dec 2012 19:48:58 -0800 (PST)
\r
17 Received: from dmz-mailsec-scanner-5.mit.edu (DMZ-MAILSEC-SCANNER-5.MIT.EDU
\r
19 by olra.theworths.org (Postfix) with ESMTP id 58DE2431FAE
\r
20 for <notmuch@notmuchmail.org>; Tue, 25 Dec 2012 19:48:58 -0800 (PST)
\r
21 X-AuditID: 12074422-b7f616d000000e7c-17-50da73a900d4
\r
22 Received: from mailhub-auth-3.mit.edu ( [18.9.21.43])
\r
23 by dmz-mailsec-scanner-5.mit.edu (Symantec Messaging Gateway) with SMTP
\r
24 id C1.4B.03708.9A37AD05; Tue, 25 Dec 2012 22:48:57 -0500 (EST)
\r
25 Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])
\r
26 by mailhub-auth-3.mit.edu (8.13.8/8.9.2) with ESMTP id qBQ3muQ1025518;
\r
27 Tue, 25 Dec 2012 22:48:56 -0500
\r
28 Received: from drake.dyndns.org (c-76-21-105-205.hsd1.ca.comcast.net
\r
29 [76.21.105.205]) (authenticated bits=0)
\r
30 (User authenticated as amdragon@ATHENA.MIT.EDU)
\r
31 by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id qBQ3mrh5013182
\r
32 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);
\r
33 Tue, 25 Dec 2012 22:48:55 -0500 (EST)
\r
34 Received: from amthrax by drake.dyndns.org with local (Exim 4.77)
\r
35 (envelope-from <amdragon@mit.edu>)
\r
36 id 1Tnhz8-0002yy-O5; Tue, 25 Dec 2012 22:48:50 -0500
\r
37 From: Austin Clements <amdragon@MIT.EDU>
\r
38 To: notmuch@notmuchmail.org
\r
39 Subject: [PATCH v2 2/5] util: Function to parse boolean term queries
\r
40 Date: Tue, 25 Dec 2012 22:48:40 -0500
\r
41 Message-Id: <1356493723-11085-3-git-send-email-amdragon@mit.edu>
\r
42 X-Mailer: git-send-email 1.7.10.4
\r
43 In-Reply-To: <1356493723-11085-1-git-send-email-amdragon@mit.edu>
\r
44 References: <1356493723-11085-1-git-send-email-amdragon@mit.edu>
\r
45 X-Brightmail-Tracker:
\r
46 H4sIAAAAAAAAA+NgFjrPIsWRmVeSWpSXmKPExsUixCmqrbuy+FaAwazPRhY3WrsZLZqmO1us
\r
47 nstjcf3mTGYHFo+ds+6ye9y6/5rd49mqW8weWw69Zw5gieKySUnNySxLLdK3S+DKOHXuMWPB
\r
48 E5GKJ5c+szUwPuXvYuTkkBAwkbjRtIoNwhaTuHBvPZDNxSEksI9R4tvfbhYIZwOjxORfz1kh
\r
49 nItMEt+unmaHcOYySvw7uJ4ZpJ9NQENi2/7ljCC2iIC0xM67s1lBbGaBPImHj7ayg9jCAi4S
\r
50 d879YgGxWQRUJRYe+Qlm8wo4SPTufMoOcYeiRPezCUB3cHBwCjhK7HxQBxIWAiqZ+PA80wRG
\r
51 /gWMDKsYZVNyq3RzEzNzilOTdYuTE/PyUot0TfVyM0v0UlNKNzGCwo3dRWkH48+DSocYBTgY
\r
52 lXh4N3y/GSDEmlhWXJl7iFGSg0lJlHd7wa0AIb6k/JTKjMTijPii0pzU4kOMEhzMSiK8zh+B
\r
53 ynlTEiurUovyYVLSHCxK4rzXUm76CwmkJ5akZqemFqQWwWRlODiUJHg3FwENFSxKTU+tSMvM
\r
54 KUFIM3FwggznARp+E6SGt7ggMbc4Mx0if4pRUUqc9wJIQgAkkVGaB9cLSwevGMWBXhHm3QNS
\r
55 xQNMJXDdr4AGMwENjuW7ATK4JBEhJdUAjE3VbX8XztT72cIwa47oneUPZyTuT/F4sKmg0Mzq
\r
56 Rc4n6VJD2Ujb6w9yF8s1fte4Gp92YsKUN3u3FbC8UerX0BfYpTix5bUA92S3Sbf0vH8oHmCx
\r
57 OFV1alKjFYNbBpcTwyJunoN8jG9eRyzRm/TqkUirSyrni+V1PvsWeef8iJ+YpKXwzk5MiaU4
\r
58 I9FQi7moOBEA49dt/+ICAAA=
\r
59 X-BeenThere: notmuch@notmuchmail.org
\r
60 X-Mailman-Version: 2.1.13
\r
62 List-Id: "Use and development of the notmuch mail system."
\r
63 <notmuch.notmuchmail.org>
\r
64 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
65 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
66 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
67 List-Post: <mailto:notmuch@notmuchmail.org>
\r
68 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
69 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
70 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
71 X-List-Received-Date: Wed, 26 Dec 2012 03:49:01 -0000
\r
73 This parses the subset of Xapian's boolean term quoting rules that are
\r
74 used by make_boolean_term. This is provided as a generic string
\r
75 utility, but will be used shortly in notmuch restore to parse and
\r
76 optimize for ID queries.
\r
78 util/string-util.c | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++
\r
79 util/string-util.h | 11 +++++++++++
\r
80 2 files changed, 62 insertions(+)
\r
82 diff --git a/util/string-util.c b/util/string-util.c
\r
83 index e4bea21..db01b4b 100644
\r
84 --- a/util/string-util.c
\r
85 +++ b/util/string-util.c
\r
86 @@ -96,3 +96,54 @@ make_boolean_term (void *ctx, const char *prefix, const char *term,
\r
92 +parse_boolean_term (void *ctx, const char *str,
\r
93 + char **prefix_out, char **term_out)
\r
95 + *prefix_out = *term_out = NULL;
\r
97 + /* Parse prefix */
\r
98 + const char *pos = strchr (str, ':');
\r
101 + *prefix_out = talloc_strndup (ctx, str, pos - str);
\r
104 + /* Implement de-quoting compatible with make_boolean_term. */
\r
105 + if (*pos == '"') {
\r
106 + char *out = talloc_strdup (ctx, pos + 1);
\r
108 + /* Find the closing quote and un-double doubled internal
\r
110 + for (pos = *term_out = out; *pos; ) {
\r
111 + if (*pos == '"') {
\r
113 + if (*pos != '"') {
\r
114 + /* Found the closing quote. */
\r
121 + /* Did the term terminate without a closing quote or is there
\r
122 + * trailing text after the closing quote? */
\r
123 + if (!closed || *pos)
\r
127 + *term_out = talloc_strdup (ctx, pos);
\r
128 + /* Check for text after the boolean term. */
\r
129 + while (*pos > ' ' && *pos != ')')
\r
137 + talloc_free (*prefix_out);
\r
138 + talloc_free (*term_out);
\r
141 diff --git a/util/string-util.h b/util/string-util.h
\r
142 index 7475e2c..aff2d65 100644
\r
143 --- a/util/string-util.h
\r
144 +++ b/util/string-util.h
\r
145 @@ -28,4 +28,15 @@ char *strtok_len (char *s, const char *delim, size_t *len);
\r
146 int make_boolean_term (void *talloc_ctx, const char *prefix, const char *term,
\r
147 char **buf, size_t *len);
\r
149 +/* Parse a boolean term query produced by make_boolean_term, returning
\r
150 + * the prefix in *prefix_out and the term in *term_out. *prefix_out
\r
151 + * and *term_out will be talloc'd with context ctx.
\r
153 + * Return: 0 on success, non-zero on parse error (including trailing
\r
157 +parse_boolean_term (void *ctx, const char *str,
\r
158 + char **prefix_out, char **term_out);
\r