tools: always include config.h before anything else.

[ccan] / tools / tools.c

diff --git a/tools/tools.c b/tools/tools.c
index eeaff6f17f644233f7aa1772ab27c69aad69f81f..24e27ba1bb1e843740943e5ecefd69242c9a6389 100644 (file)
--- a/tools/tools.c
+++ b/tools/tools.c
@@ -15,9 +15,10 @@
 #include <err.h>
 #include <unistd.h>
 #include <assert.h>
+#include <signal.h>
 #include "tools.h"
 
-static char *tmpdir = NULL;
+static const char *tmpdir = NULL;
 bool tools_verbose = false;
 
 /* Ten minutes. */
@@ -81,6 +82,8 @@ char *run_with_timeout(const void *ctx, const char *cmd,
        if (tools_verbose)
                printf("Running: %s\n", cmd);
 
+       /* Always flush buffers before fork! */
+       fflush(stdout);
        gettimeofday(&start, NULL);
        pid = fork();
        if (pid == -1) {
@@ -174,7 +177,7 @@ bool run_command(const void *ctx, unsigned int *time_ms, char **output,
        return false;
 }
 
-static int unlink_all(char *dir)
+static int unlink_all(const char *dir)
 {
        char cmd[strlen(dir) + sizeof("rm -rf ")];
        sprintf(cmd, "rm -rf %s", dir);
@@ -185,7 +188,7 @@ static int unlink_all(char *dir)
        return 0;
 }
 
-char *temp_dir(const void *ctx)
+const char *temp_dir(const void *ctx)
 {
        /* For first call, create dir. */
        while (!tmpdir) {
@@ -210,6 +213,12 @@ 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)
 {
@@ -218,11 +227,7 @@ char *maybe_temp_file(const void *ctx, const char *extension, bool keep,
        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,7 +235,7 @@ 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);
@@ -238,7 +243,10 @@ char *maybe_temp_file(const void *ctx, const char *extension, bool keep,
        } 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;