foreach, iscsi, jbitset, jmap, opt, rbtree, sparse_bsearch, tally, tdb2: add LICENSE...

[ccan] / tools / tools.c

diff --git a/tools/tools.c b/tools/tools.c
index 769d6aeee7b1535ad191c3c22167ccb616ed283c..20fcc9bb5bfba7fd142e5735e3a8841c9c3e50b2 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);
 }
 
@@ -63,10 +64,8 @@ static void killme(int sig)
        kill(-getpid(), SIGKILL);
 }
 
-static char *run_with_timeout(const void *ctx,
-                             const char *cmd,
-                             bool *ok,
-                             unsigned *timeout_ms)
+char *run_with_timeout(const void *ctx, const char *cmd,
+                      bool *ok, unsigned *timeout_ms)
 {
        pid_t pid;
        int p[2];
@@ -79,6 +78,9 @@ static char *run_with_timeout(const void *ctx,
                return talloc_asprintf(ctx, "Failed to create pipe: %s",
                                       strerror(errno));
 
+       if (tools_verbose)
+               printf("Running: %s\n", cmd);
+
        gettimeofday(&start, NULL);
        pid = fork();
        if (pid == -1) {
@@ -99,7 +101,6 @@ static char *run_with_timeout(const void *ctx,
                    || open("/dev/null", O_RDONLY) != STDIN_FILENO)
                        exit(128);
 
-               setpgid(0, 0);
                signal(SIGALRM, killme);
                itim.it_interval.tv_sec = itim.it_interval.tv_usec = 0;
                itim.it_value.tv_sec = *timeout_ms / 1000;
@@ -130,7 +131,14 @@ static char *run_with_timeout(const void *ctx,
                *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;
 }
@@ -145,6 +153,8 @@ char *run_command(const void *ctx, unsigned int *time_ms, const char *fmt, ...)
 
        if (!time_ms)
                time_ms = &default_time;
+       else if (*time_ms == 0)
+               return talloc_strdup(ctx, "\n== TIMED OUT ==\n");
 
        va_start(ap, fmt);
        cmd = talloc_vasprintf(ctx, fmt, ap);
@@ -168,12 +178,14 @@ 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;
 }
 
-char *temp_file(const void *ctx, const char *extension)
+char *temp_dir(const void *ctx)
 {
        /* For first call, create dir. */
        while (!tmpdir) {
@@ -192,9 +204,44 @@ char *temp_file(const void *ctx, const char *extension)
                        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 *maybe_temp_file(const void *ctx, const char *extension, bool keep,
+                     const char *srcname)
+{
+       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] == '/');
 
-       return talloc_asprintf(ctx, "%s/%u%s", tmpdir, count++, extension);
+       if (strrchr(srcname, '.'))
+               baselen = strrchr(srcname, '.') - srcname;
+       else
+               baselen = strlen(srcname);
+
+       do {
+               f = talloc_asprintf(ctx, "%s/%.*s%s%s",
+                                   keep ? "" : 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 file %s\n", f);
+
+       talloc_free(suffix);
+       return f;
 }
 
 bool move_file(const char *oldname, const char *newname)
@@ -204,17 +251,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;
        }
@@ -223,10 +281,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);