X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=tools%2Ftools.c;h=16246593b8b7561534df56f7eb7cd533f884c8b0;hp=eacfbf9c8d353ac89bb7e782b19d379e0aefd1a1;hb=0f66da713a750c995bb59452a95f4a71fdd8a58c;hpb=982539059656e4bbe6684e281140b3bb723deaa8

diff --git a/tools/tools.c b/tools/tools.c
index eacfbf9c..16246593 100644
--- 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,9 @@ 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);
+
 	gettimeofday(&start, NULL);
 	pid = fork();
 	if (pid == -1) {
@@ -128,6 +132,13 @@ char *run_with_timeout(const void *ctx, const char *cmd,
 	else
 		*timeout_ms -= ms;
 
+	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;
 }
@@ -167,6 +178,8 @@ 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 +204,44 @@ 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)
-{
-	return talloc_asprintf(ctx, "%s/%u%s",
-			       temp_dir(ctx), count++, extension);
-}
-
 char *maybe_temp_file(const void *ctx, const char *extension, bool keep,
 		      const char *srcname)
 {
 	size_t baselen;
+	char *f, *suffix = talloc_strdup(ctx, "");
+	struct stat st;
+	unsigned int count = 0;
 
 	if (!keep)
-		return temp_file(ctx, extension);
+		srcname = talloc_basename(ctx, srcname);
+	else
+		assert(srcname[0] == '/');
 
-	baselen = strrchr(srcname, '.') - srcname;
-	return talloc_asprintf(ctx, "%.*s%s", baselen, srcname, 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)
@@ -220,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;
 	}
@@ -239,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);