X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Fstring%2Fstring.c;h=f0d0fd4f3ff289ce8cb75f36ec3f7d7803a94649;hp=d3d17bbd3156eb065ece87e94f28810fddf7a465;hb=8aeb80ab049612adefeafea65aaa038591200944;hpb=458c48e8b27a2eff90b51610e86a870e103a28ad

diff --git a/ccan/string/string.c b/ccan/string/string.c
index d3d17bbd..f0d0fd4f 100644
--- a/ccan/string/string.c
+++ b/ccan/string/string.c
@@ -6,6 +6,11 @@
 #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)
@@ -30,4 +35,58 @@ char **strsplit(const void *ctx, const char *string, const char *delims,
 		*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;
+}