io: don't fail if we get a signal.

[ccan] / tools / depends.c

diff --git a/tools/depends.c b/tools/depends.c
index f1ff30904c897d92fef28ba54cd7c41608af76c5..36b58092cabc10e924e42cb1669e279ccab2beb7 100644 (file)
--- a/tools/depends.c
+++ b/tools/depends.c
@@ -54,8 +54,10 @@ char *compile_info(const void *ctx, const char *dir)
        fd = open(info_c_file, O_WRONLY|O_CREAT|O_EXCL, 0600);
        if (fd < 0)
                return NULL;
-       if (!write_all(fd, info, tal_count(info)-1))
+       if (!write_all(fd, info, tal_count(info)-1)) {
+               close(fd);
                return NULL;
+       }
 
        if (close(fd) != 0)
                return NULL;
@@ -253,6 +255,12 @@ static char **get_one_cflags(const void *ctx, const char *dir,
        return get_one_prop(ctx, dir, "cflags", get_info);
 }
 
+static char **get_one_ccanlint(const void *ctx, const char *dir,
+                              char *(*get_info)(const void *ctx, const char *dir))
+{
+       return get_one_prop(ctx, dir, "ccanlint", get_info);
+}
+
 /* O(n^2) but n is small. */
 static char **add_deps(char **deps1, char **deps2)
 {
@@ -282,13 +290,25 @@ char **get_cflags(const void *ctx, const char *dir,
        return flags;
 }
 
+char **get_ccanlint(const void *ctx, const char *dir,
+                   char *(*get_info)(const void *ctx, const char *dir))
+{
+       char **ccanlint;
+       unsigned int len;
+       ccanlint = get_one_ccanlint(ctx, dir, get_info);
+       len = tal_count(ccanlint);
+       tal_resize(&ccanlint, len + 1);
+       ccanlint[len] = NULL;
+       return ccanlint;
+}
+
 static char *get_one_ported(const void *ctx, const char *dir,
                            char *(*get_info)(const void *ctx, const char *dir))
 {
        char **ported = get_one_prop(ctx, dir, "ported", get_info);
 
        /* No news is good news. */
-       if (!ported || tal_count(ported) == 0)
+       if (tal_count(ported) == 0)
                return NULL;
 
        if (tal_count(ported) != 1)