X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=tools%2Fdepends.c;h=e8e0f138dc0900e2349ccf14580bd25fdd2b8b95;hp=36b58092cabc10e924e42cb1669e279ccab2beb7;hb=HEAD;hpb=fb8e88fce366e0379e7f6098183145633a8afeae diff --git a/tools/depends.c b/tools/depends.c index 36b58092..e8e0f138 100644 --- 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).