X-Git-Url: https://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=tools%2Ftools.c;h=77349d93c33b463e4dc5e18617d90d5229f497b4;hp=0a29ddf8e64cce7875a8a9d8c8fe37a0c6d90a13;hb=d0d65608c45c7c73bdd6cf57d7f7c44c402dc03a;hpb=2bce880a453a64d2d1dfc2e48184553ff4f2550b

diff --git a/tools/tools.c b/tools/tools.c
index 0a29ddf8..77349d93 100644
--- a/tools/tools.c
+++ b/tools/tools.c
@@ -1,5 +1,6 @@
 #include <ccan/talloc/talloc.h>
 #include <ccan/grab_file/grab_file.h>
+#include <ccan/err/err.h>
 #include <ccan/noerr/noerr.h>
 #include <ccan/read_write_all/read_write_all.h>
 #include <ccan/noerr/noerr.h>
@@ -13,7 +14,6 @@
 #include <unistd.h>
 #include <stdarg.h>
 #include <errno.h>
-#include <err.h>
 #include <unistd.h>
 #include <assert.h>
 #include <signal.h>
@@ -73,7 +73,7 @@ char *run_with_timeout(const void *ctx, const char *cmd,
 	int p[2];
 	char *ret;
 	int status, ms;
-	struct timeval start;
+	struct timespec start;
 
 	*ok = false;
 	if (pipe(p) != 0)
@@ -92,7 +92,6 @@ char *run_with_timeout(const void *ctx, const char *cmd,
 		close_noerr(p[1]);
 		return talloc_asprintf(ctx, "Failed to fork: %s",
 				       strerror(errno));
-		return NULL;
 	}
 
 	if (pid == 0) {
@@ -107,7 +106,7 @@ char *run_with_timeout(const void *ctx, const char *cmd,
 
 		signal(SIGALRM, killme);
 		itim.it_interval.tv_sec = itim.it_interval.tv_usec = 0;
-		itim.it_value = time_from_msec(*timeout_ms);
+		itim.it_value = timespec_to_timeval(time_from_msec(*timeout_ms));
 		setitimer(ITIMER_REAL, &itim, NULL);
 
 		status = system(cmd);
@@ -213,8 +212,7 @@ int unlink_file_destructor(char *filename)
 	return 0;
 }
 
-char *maybe_temp_file(const void *ctx, const char *extension, bool keep,
-		      const char *srcname)
+char *temp_file(const void *ctx, const char *extension, const char *srcname)
 {
 	unsigned baselen;
 	char *f, *suffix = talloc_strdup(ctx, "");
@@ -237,10 +235,7 @@ char *maybe_temp_file(const void *ctx, const char *extension, bool keep,
 	} while (lstat(f, &st) == 0);
 
 	if (tools_verbose)
-		printf("Creating %sfile %s\n", keep ? "" : "temporary ", f);
-
-	if (!keep)
-		talloc_set_destructor(f, unlink_file_destructor);
+		printf("Creating file %s\n", f);
 
 	talloc_free(suffix);
 	return f;