#include <ccan/noerr/noerr.h>
#include <ccan/read_write_all/read_write_all.h>
#include <ccan/noerr/noerr.h>
+#include <ccan/time/time.h>
#include <sys/stat.h>
#include <sys/types.h>
#include <sys/time.h>
int p[2];
char *ret;
int status, ms;
- struct timeval start, end;
+ struct timeval start;
*ok = false;
if (pipe(p) != 0)
/* Always flush buffers before fork! */
fflush(stdout);
- gettimeofday(&start, NULL);
+ start = time_now();
pid = fork();
if (pid == -1) {
close_noerr(p[0]);
close_noerr(p[1]);
return talloc_asprintf(ctx, "Failed to fork: %s",
strerror(errno));
- return NULL;
}
if (pid == 0) {
signal(SIGALRM, killme);
itim.it_interval.tv_sec = itim.it_interval.tv_usec = 0;
- itim.it_value.tv_sec = *timeout_ms / 1000;
- itim.it_value.tv_usec = (*timeout_ms % 1000) * 1000;
+ itim.it_value = time_from_msec(*timeout_ms);
setitimer(ITIMER_REAL, &itim, NULL);
status = system(cmd);
if (waitpid(pid, &status, 0) != pid)
err(1, "Failed to wait for child");
- gettimeofday(&end, NULL);
- if (end.tv_usec < start.tv_usec) {
- end.tv_usec += 1000000;
- end.tv_sec--;
- }
- ms = (end.tv_sec - start.tv_sec) * 1000
- + (end.tv_usec - start.tv_usec) / 1000;
+ ms = time_to_msec(time_sub(time_now(), start));
if (ms > *timeout_ms)
*timeout_ms = 0;
else
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, "");
} 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;