test: Test upgrade to ghost messages feature

[notmuch] / util / string-util.c

diff --git a/util/string-util.c b/util/string-util.c
index 7a71049a098d70d7788e13098ac6c28c3d33f6e3..a90501ee3e70198e652599e6da841ffe95db8f85 100644 (file)
--- a/util/string-util.c
+++ b/util/string-util.c
@@ -22,6 +22,7 @@
 #include "string-util.h"
 #include "talloc.h"
 
+#include <ctype.h>
 #include <errno.h>
 
 char *
@@ -36,6 +37,36 @@ strtok_len (char *s, const char *delim, size_t *len)
     return *len ? s : NULL;
 }
 
+const char *
+strtok_len_c (const char *s, const char *delim, size_t *len)
+{
+    /* strtok_len is already const-safe, but we can't express both
+     * versions in the C type system. */
+    return strtok_len ((char*)s, delim, len);
+}
+
+char *
+sanitize_string (const void *ctx, const char *str)
+{
+    char *out, *loop;
+
+    if (! str)
+       return NULL;
+
+    out = talloc_strdup (ctx, str);
+    if (! out)
+       return NULL;
+
+    for (loop = out; *loop; loop++) {
+       if (*loop == '\t' || *loop == '\n')
+           *loop = ' ';
+       else if ((unsigned char)(*loop) < 32)
+           *loop = '?';
+    }
+
+    return out;
+}
+
 static int
 is_unquoted_terminator (unsigned char c)
 {
@@ -52,10 +83,12 @@ make_boolean_term (void *ctx, const char *prefix, const char *term,
     int need_quoting = 0;
 
     /* Do we need quoting?  To be paranoid, we quote anything
-     * containing a quote, even though it only matters at the
+     * containing a quote or '(', even though these only matter at the
      * beginning, and anything containing non-ASCII text. */
+    if (! term[0])
+       need_quoting = 1;
     for (in = term; *in && !need_quoting; in++)
-       if (is_unquoted_terminator (*in) || *in == '"'
+       if (is_unquoted_terminator (*in) || *in == '"' || *in == '('
            || (unsigned char)*in > 127)
            need_quoting = 1;
 
@@ -107,3 +140,84 @@ make_boolean_term (void *ctx, const char *prefix, const char *term,
 
     return 0;
 }
+
+static const char*
+skip_space (const char *str)
+{
+    while (*str && isspace ((unsigned char) *str))
+       ++str;
+    return str;
+}
+
+int
+parse_boolean_term (void *ctx, const char *str,
+                   char **prefix_out, char **term_out)
+{
+    int err = EINVAL;
+    *prefix_out = *term_out = NULL;
+
+    /* Parse prefix */
+    str = skip_space (str);
+    const char *pos = strchr (str, ':');
+    if (! pos || pos == str)
+       goto FAIL;
+    *prefix_out = talloc_strndup (ctx, str, pos - str);
+    if (! *prefix_out) {
+       err = ENOMEM;
+       goto FAIL;
+    }
+    ++pos;
+
+    /* Implement de-quoting compatible with make_boolean_term. */
+    if (*pos == '"') {
+       char *out = talloc_array (ctx, char, strlen (pos));
+       int closed = 0;
+       if (! out) {
+           err = ENOMEM;
+           goto FAIL;
+       }
+       *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;
+                   pos = skip_space (pos);
+                   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 (! is_unquoted_terminator (*pos))
+           ++pos;
+       if (*skip_space (pos)) {
+           err = EINVAL;
+           goto FAIL;
+       }
+       /* No trailing text; dup the string so the caller can free
+        * it. */
+       *term_out = talloc_strndup (ctx, start, pos - start);
+       if (! *term_out) {
+           err = ENOMEM;
+           goto FAIL;
+       }
+    }
+    return 0;
+
+ FAIL:
+    talloc_free (*prefix_out);
+    talloc_free (*term_out);
+    errno = err;
+    return -1;
+}