From 25cf5f5dc45cac42f15643f6df09b46d51d7b5ec Mon Sep 17 00:00:00 2001 From: Austin Clements Date: Sun, 6 Jan 2013 15:22:38 -0500 Subject: util: Factor out boolean term quoting routine This is now a generic boolean term quoting function. It performs minimal quoting to produce user-friendly queries. This could live in tag-util as well, but it is really nothing specific to tags (although the conventions are specific to Xapian). The API is changed from "caller-allocates" to "readline-like". The scan for max tag length is pushed down into the quoting routine. Furthermore, this now combines the term prefix with the quoted term; arguably this is just as easy to do in the caller, but this will nicely parallel the boolean term parsing function to be introduced shortly. This is an amalgamation of code written by David Bremner and myself. --- util/string-util.h | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'util/string-util.h') diff --git a/util/string-util.h b/util/string-util.h index ac7676c8..719c276a 100644 --- a/util/string-util.h +++ b/util/string-util.h @@ -19,4 +19,19 @@ char *strtok_len (char *s, const char *delim, size_t *len); +/* Construct a boolean term query with the specified prefix (e.g., + * "id") and search term, quoting term as necessary. Specifically, if + * term contains any non-printable ASCII characters, non-ASCII + * characters, close parenthesis or double quotes, it will be enclosed + * in double quotes and any internal double quotes will be doubled + * (e.g. a"b -> "a""b"). The result will be a valid notmuch query and + * can be parsed by parse_boolean_term. + * + * Output is into buf; it may be talloc_realloced. + * Return: 0 on success, -1 on error. errno will be set to ENOMEM if + * there is an allocation failure. + */ +int make_boolean_term (void *talloc_ctx, const char *prefix, const char *term, + char **buf, size_t *len); + #endif -- cgit v1.2.3