1 files changed, 0 insertions, 309 deletions
diff --git a/ccan/tal/str/str.c b/ccan/tal/str/str.c
deleted file mode 100644
index 4b3b11a..0000000
--- a/ccan/tal/str/str.c
+++ /dev/null
@@ -1,309 +0,0 @@
-/* Licensed under BSD-MIT - see LICENSE file for details */
-#include <unistd.h>
-#include <stdint.h>
-#include <string.h>
-#include <limits.h>
-#include <stdlib.h>
-#include "str.h"
-#include <sys/types.h>
-#include <regex.h>
-#include <stdarg.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <ccan/str/str.h>
-
-char *tal_strdup(const tal_t *ctx, const char *p)
-{
-	/* We have to let through NULL for take(). */
-	return tal_dup_(ctx, p, 1, p ? strlen(p) + 1: 1, 0, false,
-			TAL_LABEL(char, "[]"));
-}
-
-char *tal_strndup(const tal_t *ctx, const char *p, size_t n)
-{
-	size_t len;
-	char *ret;
-
-	/* We have to let through NULL for take(). */
-	if (likely(p))
-		len = strnlen(p, n);
-	else
-		len = n;
-
-	ret = tal_dup_(ctx, p, 1, len, 1, false, TAL_LABEL(char, "[]"));
-	if (ret)
-		ret[len] = '\0';
-	return ret;
-}
-
-char *tal_fmt(const tal_t *ctx, const char *fmt, ...)
-{
-	va_list ap;
-	char *ret;
-
-	va_start(ap, fmt);
-	ret = tal_vfmt(ctx, fmt, ap);
-	va_end(ap);
-
-	return ret;
-}
-
-static bool do_vfmt(char **buf, size_t off, const char *fmt, va_list ap)
-{
-	/* A decent guess to start. */
-	size_t max = strlen(fmt) * 2 + 1;
-	bool ok;
-
-	for (;;) {
-		va_list ap2;
-		int ret;
-
-		if (!tal_resize(buf, off + max)) {
-			ok = false;
-			break;
-		}
-
-		va_copy(ap2, ap);
-		ret = vsnprintf(*buf + off, max, fmt, ap2);
-		va_end(ap2);
-
-		if (ret < max) {
-			ok = true;
-			break;
-		}
-		max *= 2;
-	}
-
-	if (taken(fmt))
-		tal_free(fmt);
-	return ok;
-}
-
-char *tal_vfmt(const tal_t *ctx, const char *fmt, va_list ap)
-{
-	char *buf;
-
-	if (!fmt && taken(fmt))
-		return NULL;
-
-	/* A decent guess to start. */
-	buf = tal_arr(ctx, char, strlen(fmt) * 2);
-	if (!do_vfmt(&buf, 0, fmt, ap))
-		buf = tal_free(buf);
-	return buf;
-}
-
-bool tal_append_vfmt(char **baseptr, const char *fmt, va_list ap)
-{
-	if (!fmt && taken(fmt))
-		return false;
-
-	return do_vfmt(baseptr, strlen(*baseptr), fmt, ap);
-}
-
-bool tal_append_fmt(char **baseptr, const char *fmt, ...)
-{
-	va_list ap;
-	bool ret;
-
-	va_start(ap, fmt);
-	ret = tal_append_vfmt(baseptr, fmt, ap);
-	va_end(ap);
-
-	return ret;
-}
-
-char *tal_strcat(const tal_t *ctx, const char *s1, const char *s2)
-{
-	size_t len1, len2;
-	char *ret;
-
-	if (unlikely(!s2) && taken(s2)) {
-		if (taken(s1))
-			tal_free(s1);
-		return NULL;
-	}
-	/* We have to let through NULL for take(). */
-	len1 = s1 ? strlen(s1) : 0;
-	len2 = strlen(s2);
-
-	/* We use tal_dup_ here to avoid attaching a length property. */
-	ret = tal_dup_(ctx, s1, 1, len1, len2 + 1, false,
-		       TAL_LABEL(char, "[]"));
-	if (likely(ret))
-		memcpy(ret + len1, s2, len2 + 1);
-
-	if (taken(s2))
-		tal_free(s2);
-	return ret;
-}
-
-char **tal_strsplit(const tal_t *ctx,
-		    const char *string, const char *delims, enum strsplit flags)
-{
-	char **parts, *str;
-	size_t max = 64, num = 0;
-
-	parts = tal_arr(ctx, char *, max + 1);
-	if (unlikely(!parts)) {
-		if (taken(string))
-			tal_free(string);
-		if (taken(delims))
-			tal_free(delims);
-		return NULL;
-	}
-	str = tal_strdup(parts, string);
-	if (unlikely(!str))
-		goto fail;
-	if (unlikely(!delims) && is_taken(delims))
-		goto fail;
-
-	if (flags == STR_NO_EMPTY)
-		str += strspn(str, delims);
-
-	while (*str != '\0') {
-		size_t len = strcspn(str, delims), dlen;
-
-		parts[num] = str;
-		dlen = strspn(str + len, delims);
-		parts[num][len] = '\0';
-		if (flags == STR_EMPTY_OK && dlen)
-			dlen = 1;
-		str += len + dlen;
-		if (++num == max && !tal_resize(&parts, max*=2 + 1))
-			goto fail;
-	}
-	parts[num] = NULL;
-
-	/* Ensure that tal_count() is correct. */
-	if (unlikely(!tal_resize(&parts, num+1)))
-		goto fail;
-
-	if (taken(delims))
-		tal_free(delims);
-	return parts;
-
-fail:
-	tal_free(parts);
-	if (taken(delims))
-		tal_free(delims);
-	return NULL;
-}
-
-char *tal_strjoin(const tal_t *ctx,
-		  char *strings[], const char *delim, enum strjoin flags)
-{
-	unsigned int i;
-	char *ret = NULL;
-	size_t totlen = 0, dlen;
-
-	if (unlikely(!strings) && is_taken(strings))
-		goto fail;
-
-	if (unlikely(!delim) && is_taken(delim))
-		goto fail;
-
-	dlen = strlen(delim);
-	ret = tal_arr(ctx, char, dlen*2+1);
-	if (!ret)
-		goto fail;
-
-	ret[0] = '\0';
-	for (i = 0; strings[i]; i++) {
-		size_t len = strlen(strings[i]);
-
-		if (flags == STR_NO_TRAIL && !strings[i+1])
-			dlen = 0;
-		if (!tal_resize(&ret, totlen + len + dlen + 1))
-			goto fail;
-		memcpy(ret + totlen, strings[i], len);
-		totlen += len;
-		memcpy(ret + totlen, delim, dlen);
-		totlen += dlen;
-	}
-	ret[totlen] = '\0';
-out:
-	if (taken(strings))
-		tal_free(strings);
-	if (taken(delim))
-		tal_free(delim);
-	return ret;
-fail:
-	ret = tal_free(ret);
-	goto out;
-}
-
-static size_t count_open_braces(const char *string)
-{
-#if 1
-	size_t num = 0, esc = 0;
-
-	while (*string) {
-		if (*string == '\\')
-			esc++;
-		else {
-			/* An odd number of \ means it's escaped. */
-			if (*string == '(' && (esc & 1) == 0)
-				num++;
-			esc = 0;
-		}
-		string++;
-	}
-	return num;
-#else
-	return strcount(string, "(");
-#endif
-}
-
-bool tal_strreg(const tal_t *ctx, const char *string, const char *regex, ...)
-{
-	size_t nmatch = 1 + count_open_braces(regex);
-	regmatch_t matches[nmatch];
-	regex_t r;
-	bool ret = false;
-	unsigned int i;
-	va_list ap;
-
-	if (unlikely(!regex) && is_taken(regex))
-		goto fail_no_re;
-
-	if (regcomp(&r, regex, REG_EXTENDED) != 0)
-		goto fail_no_re;
-
-	if (unlikely(!string) && is_taken(string))
-		goto fail;
-
-	if (regexec(&r, string, nmatch, matches, 0) != 0)
-		goto fail;
-
-	ret = true;
-	va_start(ap, regex);
-	for (i = 1; i < nmatch; i++) {
-		char **arg = va_arg(ap, char **);
-		if (arg) {
-			/* eg. ([a-z])? can give "no match". */
-			if (matches[i].rm_so == -1)
-				*arg = NULL;
-			else {
-				*arg = tal_strndup(ctx,
-						   string + matches[i].rm_so,
-						   matches[i].rm_eo
-						   - matches[i].rm_so);
-				/* FIXME: If we fail, we set some and leak! */
-				if (!*arg) {
-					ret = false;
-					break;
-				}
-			}
-		}
-	}
-	va_end(ap);
-fail:
-	regfree(&r);
-fail_no_re:
-	if (taken(regex))
-		tal_free(regex);
-	if (taken(string))
-		tal_free(string);
-	return ret;
-}