X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=tools%2Fdepends.c;h=e8e0f138dc0900e2349ccf14580bd25fdd2b8b95;hp=bf4015bf3c4c0f50ee0cc5b784517fbf02905e6d;hb=fedf515165bfafaf4fb98252ecda1abe050c8da5;hpb=d98e77e56cc401eeb75744d6fa40a92a1e6e1f94 diff --git a/tools/depends.c b/tools/depends.c index bf4015bf..e8e0f138 100644 --- a/tools/depends.c +++ b/tools/depends.c @@ -20,7 +20,7 @@ lines_from_cmd(const void *ctx, const char *format, ...) char *cmd; FILE *p; struct rbuf in; - char *str; + char *ret; va_start(ap, format); cmd = tal_vfmt(ctx, format, ap); @@ -31,13 +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, membuf_tal_realloc); - str = rbuf_read_str(&in, 0); - if (!str) + 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, str, "\n", STR_EMPTY_OK); + return tal_strsplit(ctx, ret, "\n", STR_EMPTY_OK); } /* Be careful about trying to compile over running programs (parallel make).