ccanlint: don't ever used pre-built modules as dependencies.

[ccan] / tools / tools.c

diff --git a/tools/tools.c b/tools/tools.c
index eacfbf9c8d353ac89bb7e782b19d379e0aefd1a1..77f77f0fe6741b09904f64d31ddd147871f7e40b 100644 (file)
--- a/tools/tools.c
+++ b/tools/tools.c
@@ -14,10 +14,11 @@
 #include <errno.h>
 #include <err.h>
 #include <unistd.h>
+#include <assert.h>
 #include "tools.h"
 
 static char *tmpdir = NULL;
-static unsigned int count;
+bool tools_verbose = false;
 
 /* Ten minutes. */
 const unsigned int default_timeout_ms = 10 * 60 * 1000;
@@ -27,7 +28,7 @@ char *talloc_basename(const void *ctx, const char *dir)
        char *p = strrchr(dir, '/');
 
        if (!p)
-               return (char *)dir;
+               return talloc_strdup(ctx, dir);
        return talloc_strdup(ctx, p+1);
 }
 
@@ -77,6 +78,11 @@ char *run_with_timeout(const void *ctx, const char *cmd,
                return talloc_asprintf(ctx, "Failed to create pipe: %s",
                                       strerror(errno));
 
+       if (tools_verbose)
+               printf("Running: %s\n", cmd);
+
+       /* Always flush buffers before fork! */
+       fflush(stdout);
        gettimeofday(&start, NULL);
        pid = fork();
        if (pid == -1) {
@@ -127,46 +133,55 @@ 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,
+                      WIFEXITED(status) ? "exit status" : "killed by signal",
+                      WIFEXITED(status) ? WEXITSTATUS(status)
+                      : WTERMSIG(status));
+       }
        *ok = (WIFEXITED(status) && WEXITSTATUS(status) == 0);
        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)
 {
        char cmd[strlen(dir) + sizeof("rm -rf ")];
        sprintf(cmd, "rm -rf %s", dir);
+       if (tools_verbose)
+               printf("Running: %s\n", cmd);
        if (system(cmd) != 0)
                warn("Could not remove temporary work in %s", dir);
        return 0;
@@ -191,26 +206,49 @@ char *temp_dir(const void *ctx)
                        err(1, "mkdir %s failed", tmpdir);
                }
                talloc_set_destructor(tmpdir, unlink_all);
+               if (tools_verbose)
+                       printf("Created temporary directory %s\n", tmpdir);
        }
        return tmpdir;
 }
 
-char *temp_file(const void *ctx, const char *extension)
+int unlink_file_destructor(char *filename)
 {
-       return talloc_asprintf(ctx, "%s/%u%s",
-                              temp_dir(ctx), count++, extension);
+       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;
+
+       srcname = talloc_basename(ctx, srcname);
+       if (strrchr(srcname, '.'))
+               baselen = strrchr(srcname, '.') - srcname;
+       else
+               baselen = strlen(srcname);
+
+       do {
+               f = talloc_asprintf(ctx, "%s/%.*s%s%s",
+                                   temp_dir(ctx),
+                                   baselen, srcname,
+                                   suffix, extension);
+               talloc_free(suffix);
+               suffix = talloc_asprintf(ctx, "-%u", ++count);
+       } while (lstat(f, &st) == 0);
+
+       if (tools_verbose)
+               printf("Creating %sfile %s\n", keep ? "" : "temporary ", f);
 
        if (!keep)
-               return temp_file(ctx, extension);
+               talloc_set_destructor(f, unlink_file_destructor);
 
-       baselen = strrchr(srcname, '.') - srcname;
-       return talloc_asprintf(ctx, "%.*s%s", baselen, srcname, extension);
+       talloc_free(suffix);
+       return f;
 }
 
 bool move_file(const char *oldname, const char *newname)
@@ -220,17 +258,28 @@ bool move_file(const char *oldname, const char *newname)
        int fd;
        bool ret;
 
+       if (tools_verbose)
+               printf("Moving file %s to %s: ", oldname, newname);
+
        /* Simple case: rename works. */
-       if (rename(oldname, newname) == 0)
+       if (rename(oldname, newname) == 0) {
+               if (tools_verbose)
+                       printf("rename worked\n");
                return true;
+       }
 
        /* Try copy and delete: not atomic! */
        contents = grab_file(NULL, oldname, &size);
-       if (!contents)
+       if (!contents) {
+               if (tools_verbose)
+                       printf("read failed: %s\n", strerror(errno));
                return false;
+       }
 
        fd = open(newname, O_WRONLY|O_CREAT|O_TRUNC, 0666);
        if (fd < 0) {
+               if (tools_verbose)
+                       printf("output open failed: %s\n", strerror(errno));
                ret = false;
                goto free;
        }
@@ -239,10 +288,15 @@ bool move_file(const char *oldname, const char *newname)
        if (close(fd) != 0)
                ret = false;
 
-       if (ret)
+       if (ret) {
+               if (tools_verbose)
+                       printf("copy worked\n");
                unlink(oldname);
-       else
+       } else {
+               if (tools_verbose)
+                       printf("write/close failed\n");
                unlink(newname);
+       }
 
 free:
        talloc_free(contents);