Re: [PATCH v4 0/5] Use Xapian query syntax for batch-tag dump/restore

[Tomi Ollila <tomi.ollila@iki.fi>]

On Mon, Dec 31 2012, Austin Clements <amdragon@MIT.EDU> wrote:

> This obsoletes
>
>   id:1356719189-2837-1-git-send-email-amdragon@mit.edu
>
> This version accepts whitespace before and after boolean terms in
> parse_boolean_term and expands its documentation comment to describe
> what it accepts and how that relates to Xapian and make_boolean_term.
>
> The diff from v3 is below.

With these changes this looks good to me...

Tomi


>
> diff --git a/util/string-util.c b/util/string-util.c
> index 83b4953..52c7781 100644
> --- a/util/string-util.c
> +++ b/util/string-util.c
> @@ -22,6 +22,8 @@
>  #include "string-util.h"
>  #include "talloc.h"
>  
> +#include <ctype.h>
> +
>  char *
>  strtok_len (char *s, const char *delim, size_t *len)
>  {
> @@ -97,6 +99,14 @@ make_boolean_term (void *ctx, const char *prefix, const char *term,
>      return 0;
>  }
>  
> +static const char*
> +skip_space (const char *str)
> +{
> +    while (*str && isspace (*str))
> +	++str;
> +    return str;
> +}
> +
>  int
>  parse_boolean_term (void *ctx, const char *str,
>  		    char **prefix_out, char **term_out)
> @@ -104,6 +114,7 @@ parse_boolean_term (void *ctx, const char *str,
>      *prefix_out = *term_out = NULL;
>  
>      /* Parse prefix */
> +    str = skip_space (str);
>      const char *pos = strchr (str, ':');
>      if (! pos)
>  	goto FAIL;
> @@ -123,6 +134,7 @@ parse_boolean_term (void *ctx, const char *str,
>  		if (*pos != '"') {
>  		    /* Found the closing quote. */
>  		    closed = 1;
> +		    pos = skip_space (pos);
>  		    break;
>  		}
>  	    }
> @@ -138,11 +150,11 @@ parse_boolean_term (void *ctx, const char *str,
>  	/* Check for text after the boolean term. */
>  	while (*pos > ' ' && *pos != ')')
>  	    ++pos;
> -	if (*pos)
> +	if (*skip_space (pos))
>  	    goto FAIL;
>  	/* No trailing text; dup the string so the caller can free
>  	 * it. */
> -	*term_out = talloc_strdup (ctx, start);
> +	*term_out = talloc_strndup (ctx, start, pos - start);
>      }
>      return 0;
>  
> diff --git a/util/string-util.h b/util/string-util.h
> index 43d49d0..8b9fe50 100644
> --- a/util/string-util.h
> +++ b/util/string-util.h
> @@ -33,12 +33,16 @@ 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.
> +/* Parse a boolean term query consisting of a prefix, a colon, and a
> + * term that may be quoted as described for make_boolean_term.  If the
> + * term is not quoted, then it ends at the first whitespace or close
> + * parenthesis.  str may containing leading or trailing whitespace,
> + * but anything else is considered a parse error.  This is compatible
> + * with anything produced by make_boolean_term, and supports a subset
> + * of the quoting styles supported by Xapian (and hence notmuch).
> + * *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).
> + * Return: 0 on success, non-zero on parse error.
>   */
>  int
>  parse_boolean_term (void *ctx, const char *str,
>   
>
> _______________________________________________
> notmuch mailing list
> notmuch@notmuchmail.org
> http://notmuchmail.org/mailman/listinfo/notmuch