util: add strsplit_len: simplified strtok with delimiter escaping

[notmuch] / util / string-util.c

diff --git a/util/string-util.c b/util/string-util.c
index de8430b2add34dea3fdf52507cf442c420cd170f..27f8a26b4938c4c770486e504b62f168db64f582 100644 (file)
--- a/util/string-util.c
+++ b/util/string-util.c
@@ -24,6 +24,7 @@
 
 #include <ctype.h>
 #include <errno.h>
+#include <stdbool.h>
 
 char *
 strtok_len (char *s, const char *delim, size_t *len)
@@ -37,6 +38,28 @@ strtok_len (char *s, const char *delim, size_t *len)
     return *len ? s : NULL;
 }
 
+const char *
+strsplit_len (const char *s, char delim, size_t *len)
+{
+    bool escaping = false;
+    size_t count = 0;
+
+    /* Skip initial unescaped delimiters */
+    while (*s && *s == delim)
+       s++;
+
+    while (s[count] && (escaping || s[count] != delim)) {
+       escaping = (s[count] == '\\');
+       count++;
+    }
+
+    if (count==0)
+       return NULL;
+
+    *len = count;
+    return s;
+}
+
 const char *
 strtok_len_c (const char *s, const char *delim, size_t *len)
 {