X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Fstr_talloc%2Fstr_talloc.c;h=ce7fdf8f557962de34eeaeaec10b6985f9b0f429;hp=e2d12df8791942744f3dec63f2e9a18284198a4d;hb=74257cee33ae3033f961d5f22a0313b8cb1b18d4;hpb=fa64b4599366818ea546c7db026f37d987d181a8

diff --git a/ccan/str_talloc/str_talloc.c b/ccan/str_talloc/str_talloc.c
index e2d12df8..ce7fdf8f 100644
--- a/ccan/str_talloc/str_talloc.c
+++ b/ccan/str_talloc/str_talloc.c
@@ -1,3 +1,4 @@
+/* Licensed under LGPLv2.1+ - see LICENSE file for details */
 #include <unistd.h>
 #include <stdint.h>
 #include <string.h>
@@ -11,8 +12,7 @@
 #include <ccan/talloc/talloc.h>
 #include <ccan/str/str.h>
 
-char **strsplit(const void *ctx, const char *string, const char *delims,
-		 unsigned int *nump)
+char **strsplit(const void *ctx, const char *string, const char *delims)
 {
 	char **lines = NULL;
 	unsigned int max = 64, num = 0;
@@ -30,20 +30,26 @@ char **strsplit(const void *ctx, const char *string, const char *delims,
 			lines = talloc_realloc(ctx, lines, char *, max*=2 + 1);
 	}
 	lines[num] = NULL;
-	if (nump)
-		*nump = num;
-	return lines;
+
+	/* Shrink, so talloc_get_size works */
+	return talloc_realloc(ctx, lines, char *, num+1);
 }
 
 char *strjoin(const void *ctx, char *strings[], const char *delim)
 {
 	unsigned int i;
 	char *ret = talloc_strdup(ctx, "");
+	size_t totlen = 0, dlen = strlen(delim);
 
 	for (i = 0; strings[i]; i++) {
-		ret = talloc_append_string(ret, strings[i]);
-		ret = talloc_append_string(ret, delim);
+		size_t len = strlen(strings[i]);
+		ret = talloc_realloc(ctx, ret, char, totlen + len + dlen + 1);
+		memcpy(ret + totlen, strings[i], len);
+		totlen += len;
+		memcpy(ret + totlen, delim, dlen);
+		totlen += dlen;
 	}
+	ret[totlen] = '\0';
 	return ret;
 }