ccanlint: fix output for async commands.

[ccan] / tools / ccanlint / async.c

diff --git a/tools/ccanlint/async.c b/tools/ccanlint/async.c
index 32a67d29add913cbc2c4ae3f557b91534d87456b..5c2c4da73d31b1929b1dd25fcaa513c1b2337e92 100644 (file)
--- a/tools/ccanlint/async.c
+++ b/tools/ccanlint/async.c
@@ -148,14 +148,16 @@ static void reap_output(void)
        tlist_for_each_safe(&running, c, next, list) {
                if (FD_ISSET(c->output_fd, &in)) {
                        int old_len, len;
+                       /* This length includes nul terminator! */
                        old_len = talloc_array_length(c->output);
                        c->output = talloc_realloc(c, c->output, char,
                                                   old_len + 1024);
-                       len = read(c->output_fd, c->output + old_len, 1024);
+                       len = read(c->output_fd, c->output + old_len - 1, 1024);
                        if (len < 0)
                                err(1, "Reading from async command");
                        c->output = talloc_realloc(c, c->output, char,
                                                   old_len + len);
+                       c->output[old_len + len - 1] = '\0';
                        if (len == 0) {
                                struct rusage ru;
                                wait4(c->pid, &c->status, 0, &ru);
@@ -198,3 +200,18 @@ void *collect_command(bool *ok, char **output)
        talloc_free(c);
        return (void *)ctx;
 }
+
+/* Compile and link single C file, with object files, async. */
+void compile_and_link_async(const void *ctx, unsigned int time_ms,
+                           const char *cfile, const char *ccandir,
+                           const char *objs, const char *compiler,
+                           const char *cflags,
+                           const char *libs, const char *outfile)
+{
+       if (compile_verbose)
+               printf("Compiling and linking (async) %s\n", outfile);
+       run_command_async(ctx, time_ms,
+                         "%s %s -I%s -o %s %s %s %s",
+                         compiler, cflags,
+                         ccandir, outfile, cfile, objs, libs);
+}