X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=tools%2Ftools.c;h=dd7243c2c6a7ff6d213a291642e700a661e90627;hp=b7beda72b9c5b6cf0a5ec8beffb34d535887b6a3;hb=1f45ec04761cd99011445c6d41cd64a3951f77e0;hpb=501e192029768948a81aeef6515f5d0dd6519f37

diff --git a/tools/tools.c b/tools/tools.c
index b7beda72..dd7243c2 100644
--- a/tools/tools.c
+++ b/tools/tools.c
@@ -14,10 +14,10 @@
 #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. */
@@ -28,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);
 }
 
@@ -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)
@@ -204,34 +204,48 @@ 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);
 	}
-	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)
 {
-	char *f = talloc_asprintf(ctx, "%s/%u%s",
-				  temp_dir(ctx), count++, extension);
-	if (tools_verbose)
-		printf("Created temporary file %s\n", f);
-	return f;
+	unlink(filename);
+	return 0;
 }
 
 char *maybe_temp_file(const void *ctx, const char *extension, bool keep,
 		      const char *srcname)
 {
-	size_t baselen;
-	char *f;
+	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);
 
-	if (!keep)
-		return temp_file(ctx, extension);
+	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);
 
-	baselen = strrchr(srcname, '.') - srcname;
-	f = talloc_asprintf(ctx, "%.*s%s", baselen, srcname, extension);
 	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;
 }