From: Tomi Ollila <tomi.ollila@iki.fi>
To: Austin Clements <amdragon@MIT.EDU>, notmuch@notmuchmail.org
Subject: Re: [PATCH v3 2/5] util: Function to parse boolean term queries
Date: Sat, 29 Dec 2012 23:58:21 +0200 [thread overview]
Message-ID: <m2han4sepu.fsf@guru.guru-group.fi> (raw)
In-Reply-To: <1356719189-2837-3-git-send-email-amdragon@mit.edu>
On Fri, Dec 28 2012, Austin Clements <amdragon@MIT.EDU> wrote:
> This parses the subset of Xapian's boolean term quoting rules that are
> used by make_boolean_term. This is provided as a generic string
> utility, but will be used shortly in notmuch restore to parse and
> optimize for ID queries.
> ---
> util/string-util.c | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++++
> util/string-util.h | 11 +++++++++++
> 2 files changed, 66 insertions(+)
>
> diff --git a/util/string-util.c b/util/string-util.c
> index e4bea21..83b4953 100644
> --- a/util/string-util.c
> +++ b/util/string-util.c
> @@ -96,3 +96,58 @@ make_boolean_term (void *ctx, const char *prefix, const char *term,
>
> return 0;
> }
> +
> +int
> +parse_boolean_term (void *ctx, const char *str,
> + char **prefix_out, char **term_out)
> +{
> + *prefix_out = *term_out = NULL;
> +
> + /* Parse prefix */
> + const char *pos = strchr (str, ':');
> + if (! pos)
> + goto FAIL;
> + *prefix_out = talloc_strndup (ctx, str, pos - str);
> + ++pos;
> +
> + /* Implement de-quoting compatible with make_boolean_term. */
> + if (*pos == '"') {
> + char *out = talloc_array (ctx, char, strlen (pos));
> + int closed = 0;
> + *term_out = out;
> + /* Skip the opening quote, find the closing quote, and
> + * un-double doubled internal quotes. */
> + for (++pos; *pos; ) {
> + if (*pos == '"') {
> + ++pos;
> + if (*pos != '"') {
> + /* Found the closing quote. */
> + closed = 1;
> + break;
> + }
> + }
> + *out++ = *pos++;
> + }
> + /* Did the term terminate without a closing quote or is there
> + * trailing text after the closing quote? */
> + if (!closed || *pos)
> + goto FAIL;
> + *out = '\0';
> + } else {
> + const char *start = pos;
> + /* Check for text after the boolean term. */
> + while (*pos > ' ' && *pos != ')')
> + ++pos;
> + if (*pos)
> + goto FAIL;
Mark pointed out a good case about trailing whitespace -- It would be nice
if the core were lenient for such cases. I personally remember once wasting
hours of work by just failing to notice trailing whitespace in one system
so this subject is sensitive to me...
Another thing I saw earlyer today: make_boolean_term() checks
if (*in <= ' ' || *in == ')' || *in == '"' || (unsigned char)*in > 127)
but here the check is only
while (*pos > ' ' && *pos != ')')
I wonder whether it matters...
Everyting else looks good to me.
Tomi
> + /* No trailing text; dup the string so the caller can free
> + * it. */
> + *term_out = talloc_strdup (ctx, start);
> + }
> + return 0;
> +
> + FAIL:
> + talloc_free (*prefix_out);
> + talloc_free (*term_out);
> + return 1;
> +}
> diff --git a/util/string-util.h b/util/string-util.h
> index b8844a3..43d49d0 100644
> --- a/util/string-util.h
> +++ b/util/string-util.h
> @@ -33,4 +33,15 @@ char *strtok_len (char *s, const char *delim, size_t *len);
> int make_boolean_term (void *talloc_ctx, const char *prefix, const char *term,
> char **buf, size_t *len);
>
> +/* Parse a boolean term query produced by make_boolean_term, returning
> + * the prefix in *prefix_out and the term in *term_out. *prefix_out
> + * and *term_out will be talloc'd with context ctx.
> + *
> + * Return: 0 on success, non-zero on parse error (including trailing
> + * data in str).
> + */
> +int
> +parse_boolean_term (void *ctx, const char *str,
> + char **prefix_out, char **term_out);
> +
> #endif
> --
> 1.7.10.4
>
> _______________________________________________
> notmuch mailing list
> notmuch@notmuchmail.org
> http://notmuchmail.org/mailman/listinfo/notmuch
next prev parent reply other threads:[~2012-12-29 21:58 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-12-28 18:26 [PATCH v3 0/5] Use Xapian query syntax for batch-tag dump/restore Austin Clements
2012-12-28 18:26 ` [PATCH v3 1/5] util: Factor out boolean term quoting routine Austin Clements
2012-12-28 18:26 ` [PATCH v3 2/5] util: Function to parse boolean term queries Austin Clements
2012-12-29 16:50 ` Mark Walters
2012-12-29 21:58 ` Tomi Ollila [this message]
2012-12-31 5:52 ` Austin Clements
2012-12-28 18:26 ` [PATCH v3 3/5] dump: Disallow \n in message IDs Austin Clements
2012-12-28 18:26 ` [PATCH v3 4/5] dump/restore: Use Xapian queries for batch-tag format Austin Clements
2012-12-28 18:26 ` [PATCH v3 5/5] man: Update notmuch-dump(1) and notmuch-restore(1) Austin Clements
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=m2han4sepu.fsf@guru.guru-group.fi \
--to=tomi.ollila@iki.fi \
--cc=amdragon@MIT.EDU \
--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).