bytestring: Split bytestrings by a string delimiter

[ccan] / ccan / bytestring / bytestring.c

diff --git a/ccan/bytestring/bytestring.c b/ccan/bytestring/bytestring.c
index 81cca4edbe66354779cb977058d659cde5d7ad08..09ab006ad510c3d9a4d4cf795cd64279756d2957 100644 (file)
--- a/ccan/bytestring/bytestring.c
+++ b/ccan/bytestring/bytestring.c
@@ -104,3 +104,45 @@ struct bytestring bytestring_splitchrs_next(struct bytestring whole,
 
        return _splitchrs(whole, delim, (prev.ptr - whole.ptr) + prev.len + 1);
 }
+
+static struct bytestring _splitstr(struct bytestring whole,
+                                  struct bytestring delim, size_t start)
+{
+       struct bytestring remainder, nextdelim;
+
+       assert(start <= whole.len);
+
+       remainder = bytestring_slice(whole, start, whole.len);
+       nextdelim = bytestring_bytestring(remainder, delim);
+       if (nextdelim.ptr)
+               return bytestring_slice(whole, start,
+                                       nextdelim.ptr - whole.ptr);
+       else
+               return remainder;
+}
+
+struct bytestring bytestring_splitstr_first(struct bytestring whole,
+                                            struct bytestring delim)
+{
+       if (whole.len == 0)
+               return bytestring_NULL;
+
+       return _splitstr(whole, delim, 0);
+}
+
+struct bytestring bytestring_splitstr_next(struct bytestring whole,
+                                          struct bytestring delim,
+                                          struct bytestring prev)
+{
+       if (!prev.ptr)
+               return bytestring_NULL;
+
+       /* prev has to be a substring of whole */
+       assert(prev.ptr >= whole.ptr);
+
+       if ((prev.ptr + prev.len) == (whole.ptr + whole.len))
+               return bytestring_NULL;
+
+       return _splitstr(whole, delim,
+                        (prev.ptr - whole.ptr) + prev.len + delim.len);
+}