From: david@tethera.net
To: notmuch@notmuchmail.org
Cc: David Bremner <bremner@debian.org>
Subject: [Patch v9 06/17] unhex_and_quote: new function to quote hex-decoded queries
Date: Sun, 23 Dec 2012 21:39:32 -0400 [thread overview]
Message-ID: <1356313183-9266-7-git-send-email-david@tethera.net> (raw)
In-Reply-To: <1356313183-9266-1-git-send-email-david@tethera.net>
From: David Bremner <bremner@debian.org>
Space delimited tokens are hex decoded and then quoted according to
Xapian rules. Prefixes and '*' are passed through unquoted, as is
anything that hex-decoding would not change.
---
tag-util.c | 94 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 94 insertions(+)
diff --git a/tag-util.c b/tag-util.c
index 935c8d9..b9b6099 100644
--- a/tag-util.c
+++ b/tag-util.c
@@ -56,6 +56,100 @@ illegal_tag (const char *tag, notmuch_bool_t remove)
return NULL;
}
+/* Factor out the boilerplate to append a token to the query string.
+ * For use in unhex_and_quote */
+
+static tag_parse_status_t
+append_tok (const char *tok, size_t tok_len,
+ const char *line_for_error, char **query_string)
+{
+
+ *query_string = talloc_strndup_append_buffer (*query_string, tok, tok_len);
+ if (*query_string == NULL)
+ return line_error (TAG_PARSE_OUT_OF_MEMORY, line_for_error, "aborting");
+
+ return TAG_PARSE_SUCCESS;
+}
+
+/* Input is a hex encoded string, presumed to be a query for Xapian.
+ *
+ * Space delimited tokens are decoded and quoted, with '*' and prefixes
+ * of the form "foo:" passed through unquoted.
+ */
+static tag_parse_status_t
+unhex_and_quote (void *ctx, char *encoded, const char *line_for_error,
+ char **query_string)
+{
+ char *tok = encoded;
+ size_t tok_len = 0;
+ size_t delim_len = 0;
+ char *buf = NULL;
+ size_t buf_len = 0;
+ tag_parse_status_t ret = TAG_PARSE_SUCCESS;
+
+ *query_string = talloc_strdup (ctx, "");
+
+ while ((tok = strtok_len2 (tok + tok_len + delim_len, " ()",
+ &tok_len, &delim_len)) != NULL) {
+
+ size_t prefix_len;
+ char delim = *(tok + tok_len);
+
+ *(tok + tok_len) = '\0';
+
+ /* The following matches a superset of prefixes currently
+ * used by notmuch */
+ prefix_len = strspn (tok, "abcdefghijklmnopqrstuvwxyz");
+
+ if ((strcmp (tok, "*") == 0) || prefix_len == tok_len) {
+
+ /* pass some things through without quoting or decoding.
+ * Note for '*' this is mandatory.
+ */
+
+ ret = append_tok (tok, tok_len, line_for_error, query_string);
+ if (ret) goto DONE;
+
+ } else {
+ /* potential prefix: one for ':', then something after */
+ if ((tok_len - prefix_len >= 2) && *(tok + prefix_len) == ':') {
+ ret = append_tok (tok, prefix_len + 1,
+ line_for_error, query_string);
+ if (ret) goto DONE;
+
+ tok += prefix_len + 1;
+ tok_len -= prefix_len + 1;
+ }
+
+ if (hex_decode_inplace (tok) != HEX_SUCCESS) {
+ ret = line_error (TAG_PARSE_INVALID, line_for_error,
+ "hex decoding of token '%s' failed", tok);
+ goto DONE;
+ }
+
+ if (double_quote_str (ctx, tok, &buf, &buf_len)) {
+ ret = line_error (TAG_PARSE_OUT_OF_MEMORY,
+ line_for_error, "aborting");
+ goto DONE;
+ }
+
+ ret = append_tok (buf, buf_len, line_for_error, query_string);
+ if (ret) goto DONE;
+ }
+ /* restore the string */
+ *(tok + tok_len) = delim;
+
+ /* copy any delimiters */
+ ret = append_tok (tok + tok_len, delim_len, line_for_error, query_string);
+ if (ret) goto DONE;
+ }
+
+ DONE:
+ if (ret != TAG_PARSE_SUCCESS && *query_string)
+ talloc_free (*query_string);
+ return ret;
+}
+
tag_parse_status_t
parse_tag_line (void *ctx, char *line,
tag_op_flag_t flags,
--
1.7.10.4
next prev parent reply other threads:[~2012-12-24 1:40 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-12-24 1:39 v9 of batch tagging david
2012-12-24 1:39 ` [Patch v9 01/17] parse_tag_line: use enum for return value david
2012-12-24 1:39 ` [Patch v9 02/17] tag-util: factor out rules for illegal tags, use in parse_tag_line david
2012-12-24 1:39 ` [Patch v9 03/17] notmuch-tag.c: convert to use tag-utils david
2012-12-24 1:39 ` [Patch v9 04/17] notmuch-tag: factor out double quoting routine david
2012-12-24 1:39 ` [Patch v9 05/17] util/string-util: add a new string tokenized function david
2012-12-24 1:39 ` david [this message]
2012-12-24 1:39 ` [Patch v9 07/17] notmuch-restore: move query handling for batch restore to parser david
2012-12-24 1:39 ` [Patch v9 08/17] cli: add support for batch tagging operations to "notmuch tag" david
2012-12-24 1:39 ` [Patch v9 09/17] test/tagging: add test for error messages of tag --batch david
2012-12-24 1:39 ` [Patch v9 10/17] test/tagging: add basic tests for batch tagging functionality david
2012-12-24 1:39 ` [Patch v9 11/17] test/tagging: add tests for exotic tags david
2012-12-24 1:39 ` [Patch v9 12/17] test/tagging: add test for exotic message-ids and batch tagging david
2012-12-24 1:39 ` [Patch v9 13/17] test/tagging: add test for compound queries with " david
2012-12-24 1:39 ` [Patch v9 14/17] notmuch-tag.1: tidy synopsis formatting, reference david
2012-12-24 1:39 ` [Patch v9 15/17] man: document notmuch tag --batch, --input options david
2012-12-24 1:39 ` [Patch v9 16/17] test/tagging: add test for naked punctuation in tags; compare with quoting spaces david
2012-12-24 1:39 ` [Patch v9 17/17] test/tagging: add test for handling of parenthesized tag queries david
2012-12-24 2:34 ` v9 of batch tagging Mark Walters
2012-12-24 3:31 ` David Bremner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://notmuchmail.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1356313183-9266-7-git-send-email-david@tethera.net \
--to=david@tethera.net \
--cc=bremner@debian.org \
--cc=notmuch@notmuchmail.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://yhetil.org/notmuch.git/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).