ccanlint: -k should not pollute module directory.

[ccan] / tools / tools.c

diff --git a/tools/tools.c b/tools/tools.c
index d27db719e973034183a8fb7a5e837b2a481cf6e7..dd7243c2c6a7ff6d213a291642e700a661e90627 100644 (file)
--- a/tools/tools.c
+++ b/tools/tools.c
@@ -131,7 +131,7 @@ char *run_with_timeout(const void *ctx, const char *cmd,
                *timeout_ms = 0;
        else
                *timeout_ms -= ms;
-
+       close(p[0]);
        if (tools_verbose) {
                printf("%s", ret);
                printf("Finished: %u ms, %s %u\n", ms,
@@ -143,35 +143,35 @@ char *run_with_timeout(const void *ctx, const char *cmd,
        return ret;
 }
 
-/* Returns output if command fails. */
-char *run_command(const void *ctx, unsigned int *time_ms, const char *fmt, ...)
+/* Tallocs *output off ctx; return false if command fails. */
+bool run_command(const void *ctx, unsigned int *time_ms, char **output,
+                const char *fmt, ...)
 {
        va_list ap;
-       char *cmd, *contents;
+       char *cmd;
        bool ok;
        unsigned int default_time = default_timeout_ms;
 
        if (!time_ms)
                time_ms = &default_time;
-       else if (*time_ms == 0)
-               return talloc_strdup(ctx, "\n== TIMED OUT ==\n");
+       else if (*time_ms == 0) {
+               *output = talloc_strdup(ctx, "\n== TIMED OUT ==\n");
+               return false;
+       }
 
        va_start(ap, fmt);
        cmd = talloc_vasprintf(ctx, fmt, ap);
        va_end(ap);
 
-       contents = run_with_timeout(ctx, cmd, &ok, time_ms);
-       if (ok) {
-               talloc_free(contents);
-               return NULL;
-       }
-
-       if (!contents)
+       *output = run_with_timeout(ctx, cmd, &ok, time_ms);
+       if (ok)
+               return true;
+       if (!*output)
                err(1, "Problem running child");
        if (*time_ms == 0)
-               contents = talloc_asprintf_append(contents,
-                                                 "\n== TIMED OUT ==\n");
-       return contents;
+               *output = talloc_asprintf_append(*output,
+                                                "\n== TIMED OUT ==\n");
+       return false;
 }
 
 static int unlink_all(char *dir)
@@ -210,19 +210,21 @@ char *temp_dir(const void *ctx)
        return tmpdir;
 }
 
+int unlink_file_destructor(char *filename)
+{
+       unlink(filename);
+       return 0;
+}
+
 char *maybe_temp_file(const void *ctx, const char *extension, bool keep,
                      const char *srcname)
 {
-       size_t baselen;
+       unsigned baselen;
        char *f, *suffix = talloc_strdup(ctx, "");
        struct stat st;
        unsigned int count = 0;
 
-       if (!keep)
-               srcname = talloc_basename(ctx, srcname);
-       else
-               assert(srcname[0] == '/');
-
+       srcname = talloc_basename(ctx, srcname);
        if (strrchr(srcname, '.'))
                baselen = strrchr(srcname, '.') - srcname;
        else
@@ -230,15 +232,18 @@ char *maybe_temp_file(const void *ctx, const char *extension, bool keep,
 
        do {
                f = talloc_asprintf(ctx, "%s/%.*s%s%s",
-                                   keep ? "" : temp_dir(ctx),
+                                   temp_dir(ctx),
                                    baselen, srcname,
                                    suffix, extension);
                talloc_free(suffix);
                suffix = talloc_asprintf(ctx, "-%u", ++count);
-       } while (!keep && lstat(f, &st) == 0);
+       } while (lstat(f, &st) == 0);
 
        if (tools_verbose)
-               printf("Creating file %s\n", f);
+               printf("Creating %sfile %s\n", keep ? "" : "temporary ", f);
+
+       if (!keep)
+               talloc_set_destructor(f, unlink_file_destructor);
 
        talloc_free(suffix);
        return f;