diff options
Diffstat (limited to 'contrib/bmake/trace.c')
| -rw-r--r-- | contrib/bmake/trace.c | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/contrib/bmake/trace.c b/contrib/bmake/trace.c index 840c7995e5c1..9674cec7becb 100644 --- a/contrib/bmake/trace.c +++ b/contrib/bmake/trace.c @@ -1,4 +1,4 @@ -/* $NetBSD: trace.c,v 1.28 2021/02/05 05:15:12 rillig Exp $ */ +/* $NetBSD: trace.c,v 1.33 2023/03/28 14:39:31 rillig Exp $ */ /* * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -48,13 +48,13 @@ #include "job.h" #include "trace.h" -MAKE_RCSID("$NetBSD: trace.c,v 1.28 2021/02/05 05:15:12 rillig Exp $"); +MAKE_RCSID("$NetBSD: trace.c,v 1.33 2023/03/28 14:39:31 rillig Exp $"); static FILE *trfile; static pid_t trpid; -const char *trwd; +static const char *trwd; -static const char *evname[] = { +static const char evname[][4] = { "BEG", "END", "ERR", @@ -69,8 +69,10 @@ Trace_Init(const char *pathname) if (pathname != NULL) { FStr curDir; trpid = getpid(); - /* XXX: This variable may get overwritten later, which - * would make trwd point to undefined behavior. */ + /* + * XXX: This variable may get overwritten later, which would + * make trwd point to undefined behavior. + */ curDir = Var_Value(SCOPE_GLOBAL, ".CURDIR"); trwd = curDir.str; @@ -88,10 +90,17 @@ Trace_Log(TrEvent event, Job *job) gettimeofday(&rightnow, NULL); +#if __STDC_VERSION__ >= 199901L fprintf(trfile, "%lld.%06ld %d %s %d %s", (long long)rightnow.tv_sec, (long)rightnow.tv_usec, jobTokensRunning, evname[event], trpid, trwd); +#else + fprintf(trfile, "%ld.%06ld %d %s %d %s", + (long)rightnow.tv_sec, (long)rightnow.tv_usec, + jobTokensRunning, + evname[event], trpid, trwd); +#endif if (job != NULL) { char flags[4]; |