merge

diff --git a/ccan/string/_info.c b/ccan/string/_info.c
index 37c6dbf5940ca707dafa180bc71ae55865f89bf0..e8c4061ae08c63a4618b4eb46994459a8d02f364 100644 (file)
--- a/ccan/string/_info.c
+++ b/ccan/string/_info.c
@@ -29,6 +29,7 @@ int main(int argc, char *argv[])
 
        if (strcmp(argv[1], "depends") == 0) {
                printf("ccan/talloc\n");
+               printf("ccan/noerr\n");
                return 0;
        }
 

diff --git a/ccan/string/string.c b/ccan/string/string.c
index 9182ac0650fb7b9c94ba72aa12872ca7f44310d0..6e473af36cf3862580e6c1f706d46861e99dc874 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,15 +48,6 @@ 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)
 {
        int ret;
@@ -91,6 +83,6 @@ void *grab_file(const void *ctx, const char *filename)
                return NULL;
 
        buffer = grab_fd(ctx, fd);
-       close_no_errno(fd);
+       close_noerr(fd);
        return buffer;
 }

diff --git a/tools/Makefile b/tools/Makefile
index 3c7fb7fa60dc57d0afaf28d8b92fef2045185a68..a312e5dd17153387f450f782dd0a2b430201911b 100644 (file)
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -1,12 +1,12 @@
-tools/ccan_depends: tools/ccan_depends.o tools/depends.o tools/grab_file.o ccan/string/string.o ccan/talloc/talloc.o
+tools/ccan_depends: tools/ccan_depends.o tools/depends.o ccan/string/string.o ccan/talloc/talloc.o ccan/noerr/noerr.o
 
-tools/run_tests: tools/run_tests.o tools/depends.o tools/grab_file.o ccan/tap/tap.o ccan/string/string.o ccan/talloc/talloc.o
+tools/run_tests: tools/run_tests.o tools/depends.o ccan/tap/tap.o ccan/string/string.o ccan/talloc/talloc.o
 
 tools/doc_extract: tools/doc_extract.o ccan/string/string.o ccan/talloc/talloc.o
 
-tools/namespacize: tools/namespacize.o tools/grab_file.o tools/depends.o ccan/string/string.o ccan/talloc/talloc.o
+tools/namespacize: tools/namespacize.o tools/depends.o ccan/string/string.o ccan/talloc/talloc.o
 
-tools/run_tests.o tools/namespacize.o tools/grab_file.o tools/depends.o: tools/tools.h
+tools/run_tests.o tools/namespacize.o tools/depends.o: tools/tools.h
 
 tools-clean: ccanlint-clean
        rm -f tools/ccan_depends tools/run_tests tools/doc_extract tools/namespacize

diff --git a/tools/grab_file.c b/tools/grab_file.c
deleted file mode 100644 (file)
index 5a2ff69..0000000
--- a/tools/grab_file.c
+++ /dev/null
@@ -1,58 +0,0 @@
-#include "tools.h"
-#include "talloc/talloc.h"
-#include "string/string.h"
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <errno.h>
-
-/*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;
-}*/
-
-/* This version adds one byte (for nul term) */
-/*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;
-}*/
-