X-Git-Url: https://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=tools%2Ftools.c;h=20fcc9bb5bfba7fd142e5735e3a8841c9c3e50b2;hp=d27db719e973034183a8fb7a5e837b2a481cf6e7;hb=cbd27e92c3e00e004b50ac998d131e52ac1290ea;hpb=63bceea014e091a2f2907e49f7c3b33f042106f4

diff --git a/tools/tools.c b/tools/tools.c
index d27db719..20fcc9bb 100644
--- a/tools/tools.c
+++ b/tools/tools.c
@@ -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,
@@ -213,7 +213,7 @@ char *temp_dir(const void *ctx)
 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;
@@ -235,7 +235,7 @@ char *maybe_temp_file(const void *ctx, const char *extension, bool keep,
 				    suffix, extension);
 		talloc_free(suffix);
 		suffix = talloc_asprintf(ctx, "-%u", ++count);
-	} while (!keep && lstat(f, &st) == 0);
+	} while (lstat(f, &st) == 0);
 
 	if (tools_verbose)
 		printf("Creating file %s\n", f);