X-Git-Url: https://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=tools%2Ftools.c;h=24e27ba1bb1e843740943e5ecefd69242c9a6389;hp=dd7243c2c6a7ff6d213a291642e700a661e90627;hb=1c92b49f17c58ebad46ba8a4f628ddd3a09d46e7;hpb=1f45ec04761cd99011445c6d41cd64a3951f77e0

diff --git a/tools/tools.c b/tools/tools.c
index dd7243c2..24e27ba1 100644
--- a/tools/tools.c
+++ b/tools/tools.c
@@ -15,9 +15,10 @@
 #include <err.h>
 #include <unistd.h>
 #include <assert.h>
+#include <signal.h>
 #include "tools.h"
 
-static char *tmpdir = NULL;
+static const char *tmpdir = NULL;
 bool tools_verbose = false;
 
 /* Ten minutes. */
@@ -81,6 +82,8 @@ char *run_with_timeout(const void *ctx, const char *cmd,
 	if (tools_verbose)
 		printf("Running: %s\n", cmd);
 
+	/* Always flush buffers before fork! */
+	fflush(stdout);
 	gettimeofday(&start, NULL);
 	pid = fork();
 	if (pid == -1) {
@@ -174,7 +177,7 @@ bool run_command(const void *ctx, unsigned int *time_ms, char **output,
 	return false;
 }
 
-static int unlink_all(char *dir)
+static int unlink_all(const char *dir)
 {
 	char cmd[strlen(dir) + sizeof("rm -rf ")];
 	sprintf(cmd, "rm -rf %s", dir);
@@ -185,7 +188,7 @@ static int unlink_all(char *dir)
 	return 0;
 }
 
-char *temp_dir(const void *ctx)
+const char *temp_dir(const void *ctx)
 {
 	/* For first call, create dir. */
 	while (!tmpdir) {