summaryrefslogtreecommitdiff
path: root/strbuf.c
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2011-06-09 15:51:22 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-06-22 18:24:50 (GMT)
commit28fc3a6857a5d7a6b4f63b2672fb0ce966b0df78 (patch)
tree96e604d953b38fa5f41b7f0be61e06c7e27623d8 /strbuf.c
parente5af0de202e885b793482d416b8ce9d50dd2b8bc (diff)
downloadgit-28fc3a6857a5d7a6b4f63b2672fb0ce966b0df78.zip
git-28fc3a6857a5d7a6b4f63b2672fb0ce966b0df78.tar.gz
git-28fc3a6857a5d7a6b4f63b2672fb0ce966b0df78.tar.bz2
strbuf_split: add a max parameter
Sometimes when splitting, you only want a limited number of fields, and for the final field to contain "everything else", even if it includes the delimiter. This patch introduces strbuf_split_max, which provides a "max number of fields" parameter; it behaves similarly to perl's "split" with a 3rd field. The existing 2-argument form of strbuf_split is retained for compatibility and ease-of-use. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'strbuf.c')
-rw-r--r--strbuf.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/strbuf.c b/strbuf.c
index 77444a9..74f661e 100644
--- a/strbuf.c
+++ b/strbuf.c
@@ -101,7 +101,7 @@ void strbuf_ltrim(struct strbuf *sb)
sb->buf[sb->len] = '\0';
}
-struct strbuf **strbuf_split(const struct strbuf *sb, int delim)
+struct strbuf **strbuf_split_max(const struct strbuf *sb, int delim, int max)
{
int alloc = 2, pos = 0;
char *n, *p;
@@ -112,7 +112,10 @@ struct strbuf **strbuf_split(const struct strbuf *sb, int delim)
p = n = sb->buf;
while (n < sb->buf + sb->len) {
int len;
- n = memchr(n, delim, sb->len - (n - sb->buf));
+ if (max <= 0 || pos + 1 < max)
+ n = memchr(n, delim, sb->len - (n - sb->buf));
+ else
+ n = NULL;
if (pos + 1 >= alloc) {
alloc = alloc * 2;
ret = xrealloc(ret, sizeof(struct strbuf *) * alloc);