X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Fstring%2Fstring.c;fp=ccan%2Fstring%2Fstring.c;h=0000000000000000000000000000000000000000;hp=f0d0fd4f3ff289ce8cb75f36ec3f7d7803a94649;hb=9965fc25fcc92dc76d1cd4cf9595dc3dc9ebc586;hpb=963fa5ca9303d146d635e2fba04814f4f791c559

diff --git a/ccan/string/string.c b/ccan/string/string.c
deleted file mode 100644
index f0d0fd4f..00000000
--- a/ccan/string/string.c
+++ /dev/null
@@ -1,92 +0,0 @@
-#include <unistd.h>
-#include <stdint.h>
-#include <string.h>
-#include <limits.h>
-#include <assert.h>
-#include <stdlib.h>
-#include "string.h"
-#include "talloc/talloc.h"
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <errno.h>
-#include "noerr/noerr.h"
-
-char **strsplit(const void *ctx, const char *string, const char *delims,
-		 unsigned int *nump)
-{
-	char **lines = NULL;
-	unsigned int max = 64, num = 0;
-
-	lines = talloc_array(ctx, char *, max+1);
-
-	while (*string != '\0') {
-		unsigned int len = strcspn(string, delims);
-		lines[num] = talloc_array(lines, char, len + 1);
-		memcpy(lines[num], string, len);
-		lines[num][len] = '\0';
-		string += len;
-		string += strspn(string, delims) ? 1 : 0;
-		if (++num == max)
-			lines = talloc_realloc(ctx, lines, char *, max*=2 + 1);
-	}
-	lines[num] = NULL;
-	if (nump)
-		*nump = num;
-	return lines;
-}
-
-char *strjoin(const void *ctx, char *strings[], const char *delim)
-{
-	unsigned int i;
-	char *ret = talloc_strdup(ctx, "");
-
-	for (i = 0; strings[i]; i++) {
-		ret = talloc_append_string(ret, strings[i]);
-		ret = talloc_append_string(ret, delim);
-	}
-	return ret;
-}
-
-void *grab_fd(const void *ctx, int fd, size_t *size)
-{
-	int ret;
-	size_t max = 16384, s;
-	char *buffer;
-
-	if (!size)
-		size = &s;
-	*size = 0;
-
-	buffer = talloc_array(ctx, char, max+1);
-	while ((ret = read(fd, buffer + *size, max - *size)) > 0) {
-		*size += ret;
-		if (*size == max)
-			buffer = talloc_realloc(ctx, buffer, char, max*=2 + 1);
-	}
-	if (ret < 0) {
-		talloc_free(buffer);
-		buffer = NULL;
-	} else
-		buffer[*size] = '\0';
-
-	return buffer;
-}
-
-void *grab_file(const void *ctx, const char *filename, size_t *size)
-{
-	int fd;
-	char *buffer;
-
-	if (!filename)
-		fd = dup(STDIN_FILENO);
-	else
-		fd = open(filename, O_RDONLY, 0);
-
-	if (fd < 0)
-		return NULL;
-
-	buffer = grab_fd(ctx, fd, size);
-	close_noerr(fd);
-	return buffer;
-}