grab_fd and grab_file: add a size arg, use everywhere.

[ccan] / ccan / string / string.c

diff --git a/ccan/string/string.c b/ccan/string/string.c
index 9182ac0650fb7b9c94ba72aa12872ca7f44310d0..f0d0fd4f3ff289ce8cb75f36ec3f7d7803a94649 100644 (file)
--- a/ccan/string/string.c
+++ b/ccan/string/string.c
@@ -10,6 +10,7 @@
 #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)
@@ -47,42 +48,37 @@ char *strjoin(const void *ctx, char *strings[], const char *delim)
        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)
+void *grab_fd(const void *ctx, int fd, size_t *size)
 {
        int ret;
-       unsigned int max = 16384, size = 0;
+       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)
+       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';
+               buffer[*size] = '\0';
 
        return buffer;
 }
 
-void *grab_file(const void *ctx, const char *filename)
+void *grab_file(const void *ctx, const char *filename, size_t *size)
 {
        int fd;
        char *buffer;
 
-       if (streq(filename, "-"))
+       if (!filename)
                fd = dup(STDIN_FILENO);
        else
                fd = open(filename, O_RDONLY, 0);
@@ -90,7 +86,7 @@ void *grab_file(const void *ctx, const char *filename)
        if (fd < 0)
                return NULL;
 
-       buffer = grab_fd(ctx, fd);
-       close_no_errno(fd);
+       buffer = grab_fd(ctx, fd, size);
+       close_noerr(fd);
        return buffer;
 }