From 119e72cc90ea7d55b054f8f82dfb7941597ad7cc Mon Sep 17 00:00:00 2001 From: Johnothan King Date: Sat, 14 Dec 2024 21:32:56 -0800 Subject: [PATCH] Fix a few more invalid assumptions about time_t (which != unsigned long) --- src/cmd/INIT/mamake.c | 2 +- src/cmd/ksh93/edit/history.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/cmd/INIT/mamake.c b/src/cmd/INIT/mamake.c index c5b8b09c6c9b..8391c2309ba6 100644 --- a/src/cmd/INIT/mamake.c +++ b/src/cmd/INIT/mamake.c @@ -409,7 +409,7 @@ static void report(int level, char *text, char *item, Rule_t *r) fprintf(stderr, "%s", text); if (r && r->time && state.debug <= -2) #if __STDC_VERSION__ >= 199901L - fprintf(stderr, " %lld", (long long)r->time); + fprintf(stderr, " %llu", (unsigned long long)r->time); #else fprintf(stderr, " %lu", (unsigned long)r->time); #endif diff --git a/src/cmd/ksh93/edit/history.c b/src/cmd/ksh93/edit/history.c index 94cf50536a52..ab96c3ad4a4f 100644 --- a/src/cmd/ksh93/edit/history.c +++ b/src/cmd/ksh93/edit/history.c @@ -747,9 +747,9 @@ static ssize_t hist_write(Sfio_t *iop,const void *buff,size_t insize,Sfdisc_t* h if(hp->auditfp) { time_t t=time(NULL); - sfprintf(hp->auditfp, "%u;%lu;%s;%*s%c", + sfprintf(hp->auditfp, "%u;%llu;%s;%*s%c", sh_isoption(SH_PRIVILEGED) ? sh.euserid : sh.userid, - (unsigned long)t, hp->tty, size, buff, 0); + (unsigned long long)t, hp->tty, size, buff, 0); sfsync(hp->auditfp); } #endif /* SHOPT_AUDIT */