Moving grab_file

[ccan] / ccan / string / string.c

diff --git a/ccan/string/string.c b/ccan/string/string.c
index b1de8eda915bbf3ee81fc2e9f1df96603eb6084b..9182ac0650fb7b9c94ba72aa12872ca7f44310d0 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 <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)
 
 char **strsplit(const void *ctx, const char *string, const char *delims,
                 unsigned int *nump)


@@ -42,3 +46,51 @@ char *strjoin(const void *ctx, char *strings[], const char *delim)
        }
        return ret;
 }
        }
        return ret;
 }

+
+static int close_no_errno(int fd)
+{
+       int ret = 0, serrno = errno;
+       if (close(fd) < 0)
+               ret = errno;
+       errno = serrno;
+       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;
+}
+
+void *grab_file(const void *ctx, const char *filename)
+{
+       int fd;
+       char *buffer;
+
+       if (streq(filename, "-"))
+               fd = dup(STDIN_FILENO);
+       else
+               fd = open(filename, O_RDONLY, 0);
+
+       if (fd < 0)
+               return NULL;
+
+       buffer = grab_fd(ctx, fd);
+       close_no_errno(fd);
+       return buffer;
+}