+/* Licensed under LGPLv2.1+ - see LICENSE file for details */
#include <unistd.h>
#include <stdint.h>
#include <string.h>
#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;
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;
}