crypto/shachain: detect if we're inserting a bogus hash.

[ccan] / tools / tools.c

diff --git a/tools/tools.c b/tools/tools.c
index f0a9ad46f1e8e48307cedc1b9f4ef608a8a9aac4..b78702d03a6d1ff26df2a1d412f3bb2965d40b67 100644 (file)
--- a/tools/tools.c
+++ b/tools/tools.c
@@ -39,7 +39,7 @@ char *run_with_timeout(const void *ctx, const char *cmd,
        int p[2];
        struct rbuf in;
        int status, ms;
-       struct timespec start;
+       struct timeabs start;
 
        *ok = false;
        if (pipe(p) != 0)
@@ -71,7 +71,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 = timespec_to_timeval(time_from_msec(*timeout_ms));
+               itim.it_value = timespec_to_timeval(time_from_msec(*timeout_ms).ts);
                setitimer(ITIMER_REAL, &itim, NULL);
 
                status = system(cmd);
@@ -90,7 +90,7 @@ char *run_with_timeout(const void *ctx, const char *cmd,
        if (waitpid(pid, &status, 0) != pid)
                err(1, "Failed to wait for child");
 
-       ms = time_to_msec(time_sub(time_now(), start));
+       ms = time_to_msec(time_between(time_now(), start));
        if (ms > *timeout_ms)
                *timeout_ms = 0;
        else