From 923572be6afadb10e8cf16e10a22dbba5bc25f0d Mon Sep 17 00:00:00 2001 From: charnier Date: Wed, 5 Feb 2003 13:18:17 +0000 Subject: Display elapsed time (-o etime) using [[dd-]hh:]mm:ss, which according to Solaris man page is the POSIX way. Reviewed by: jmallett --- bin/ps/print.c | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) (limited to 'bin/ps/print.c') diff --git a/bin/ps/print.c b/bin/ps/print.c index 6b3489b..69d33ba 100644 --- a/bin/ps/print.c +++ b/bin/ps/print.c @@ -36,6 +36,7 @@ static char sccsid[] = "@(#)print.c 8.6 (Berkeley) 4/16/94"; #endif /* not lint */ #endif + #include __FBSDID("$FreeBSD$"); @@ -539,14 +540,30 @@ void elapsed(KINFO *k, VARENT *ve) { VAR *v; - time_t secs; + time_t days, hours, mins, secs; char obuff[128]; v = ve->var; secs = now - k->ki_p->ki_start.tv_sec; - (void)snprintf(obuff, sizeof(obuff), "%3ld:%02ld", (long)secs/60, - (long)secs%60); + days = secs/(24*60*60); + secs %= (24*60*60); + hours = secs/(60*60); + secs %= (60*60); + mins = secs/60; + secs %= 60; + if (days != 0) { + (void)snprintf(obuff, sizeof(obuff), "%3ld-%02ld:%02ld:%02ld", + (long)days, (long)hours, (long)mins, (long)secs); + } + else if (hours != 0) { + (void)snprintf(obuff, sizeof(obuff), "%02ld:%02ld:%02ld", + (long)hours, (long)mins, (long)secs); + } + else { + (void)snprintf(obuff, sizeof(obuff), "%02ld:%02ld", + (long)mins, (long)secs); + } (void)printf("%*s", v->width, obuff); } -- cgit v1.1