X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=ccan%2Fbytestring%2Fbytestring.c;h=09ab006ad510c3d9a4d4cf795cd64279756d2957;hb=712dc43d55741bc11490abae8f7edbb8ec982f0d;hp=ddc5dcd06e9e1427b6776fc8a7b92c5164f51f5a;hpb=cb2d540f764b225a068a3cdd1396df4fc8dc6824;p=ccan

diff --git a/ccan/bytestring/bytestring.c b/ccan/bytestring/bytestring.c
index ddc5dcd0..09ab006a 100644
--- a/ccan/bytestring/bytestring.c
+++ b/ccan/bytestring/bytestring.c
@@ -66,3 +66,83 @@ struct bytestring bytestring_splitchr_next(struct bytestring whole,
 
 	return _splitchr(whole, delim, (prev.ptr - whole.ptr) + prev.len + 1);
 }
+
+static struct bytestring _splitchrs(struct bytestring whole,
+				    struct bytestring delim, size_t start)
+{
+	struct bytestring remainder;
+	size_t n;
+
+	assert(start <= whole.len);
+
+	remainder = bytestring_slice(whole, start, whole.len);
+	n = bytestring_cspn(remainder, delim);
+	return bytestring_slice(whole, start, start + n);
+}
+
+struct bytestring bytestring_splitchrs_first(struct bytestring whole,
+					     struct bytestring delim)
+{
+	if (whole.len == 0)
+		return bytestring_NULL;
+
+	return _splitchrs(whole, delim, 0);
+}
+
+struct bytestring bytestring_splitchrs_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 _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);
+}