Moving grab_file

diff --git a/ccan/string/string.c b/ccan/string/string.c
index 7686813c9a392ab5cf94c8b624e3037e28fbd601..9182ac0650fb7b9c94ba72aa12872ca7f44310d0 100644 (file)
--- a/ccan/string/string.c
+++ b/ccan/string/string.c
@@ -47,6 +47,15 @@ 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;
 void *grab_fd(const void *ctx, int fd)
 {
        int ret;


@@ -67,3 +76,21 @@ void *grab_fd(const void *ctx, int fd)
 
        return buffer;
 }
 
        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;
+}

diff --git a/tools/grab_file.c b/tools/grab_file.c
index 3c9eee6d33c55688b1a0c0fc9150d1c0b9795871..5a2ff69b50ac1ab9a3304783ff03dc56e300cdc8 100644 (file)
--- a/tools/grab_file.c
+++ b/tools/grab_file.c
@@ -7,14 +7,14 @@
 #include <unistd.h>
 #include <errno.h>
 
 #include <unistd.h>
 #include <errno.h>
 

-static int close_no_errno(int fd)
+/*static int close_no_errno(int fd)

 {
        int ret = 0, serrno = errno;
        if (close(fd) < 0)
                ret = errno;
        errno = serrno;
        return ret;
 {
        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)
 {


@@ -38,7 +38,7 @@ static int close_no_errno(int fd)
 }*/
 
 /* This version adds one byte (for nul term) */
 }*/
 
 /* This version adds one byte (for nul term) */

-void *grab_file(const void *ctx, const char *filename)
+/*void *grab_file(const void *ctx, const char *filename)

 {
        int fd;
        char *buffer;
 {
        int fd;
        char *buffer;


@@ -54,5 +54,5 @@ void *grab_file(const void *ctx, const char *filename)
        buffer = grab_fd(ctx, fd);
        close_no_errno(fd);
        return buffer;
        buffer = grab_fd(ctx, fd);
        close_no_errno(fd);
        return buffer;

-}
+}*/