Moving grad_fd to string.c

[ccan] / ccan / string / string.c

diff --git a/ccan/string/string.c b/ccan/string/string.c
index d3d17bbd3156eb065ece87e94f28810fddf7a465..7686813c9a392ab5cf94c8b624e3037e28fbd601 100644 (file)
--- a/ccan/string/string.c
+++ b/ccan/string/string.c
@@ -6,6 +6,10 @@
 #include <stdlib.h>
 #include "string.h"
 #include "talloc/talloc.h"
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <errno.h>
 
 char **strsplit(const void *ctx, const char *string, const char *delims,
                 unsigned int *nump)
@@ -30,4 +34,36 @@ 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)
+{
+       int ret;
+       unsigned int max = 16384, size = 0;
+       char *buffer;
+
+       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;
+}