io: don't leave errno as a random value when we hit EOF.

[ccan] / tools / depends.c

diff --git a/tools/depends.c b/tools/depends.c
index 95bda1b50a7b33088f41345a7369fa5e982ffa21..e8e0f138dc0900e2349ccf14580bd25fdd2b8b95 100644 (file)
--- a/tools/depends.c
+++ b/tools/depends.c
@@ -20,6 +20,7 @@ lines_from_cmd(const void *ctx, const char *format, ...)
        char *cmd;
        FILE *p;
        struct rbuf in;
+       char *ret;
 
        va_start(ap, format);
        cmd = tal_vfmt(ctx, format, ap);
@@ -30,12 +31,14 @@ lines_from_cmd(const void *ctx, const char *format, ...)
                err(1, "Executing '%s'", cmd);
 
        /* FIXME: Use rbuf_read_str(&in, '\n') rather than strsplit! */
-       rbuf_init(&in, fileno(p), tal_arr(ctx, char, 0), 0);
-       if (!rbuf_read_str(&in, 0, do_tal_realloc) && errno)
+       rbuf_init(&in, fileno(p), tal_arr(ctx, char, 0), 0,
+                 tal_rbuf_enlarge);
+       ret = rbuf_read_str(&in, 0);
+       if (!ret && errno)
                err(1, "Reading from '%s'", cmd);
        pclose(p);
 
-       return tal_strsplit(ctx, in.buf, "\n", STR_EMPTY_OK);
+       return tal_strsplit(ctx, ret, "\n", STR_EMPTY_OK);
 }
 
 /* Be careful about trying to compile over running programs (parallel make).
@@ -54,8 +57,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;
@@ -306,7 +311,7 @@ static char *get_one_ported(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)