From c2290ff6b8f08e178fe65a73d093a5941e6cae6c Mon Sep 17 00:00:00 2001 From: Mark Felder Date: Tue, 17 Mar 2015 12:40:33 +0000 Subject: [PATCH] Use 24h timestamps in the ps(1) STARTED column The previous 12h AM/PM format was perplexing as it didn't follow the locale of the user and was a minor annoyance to FreeBSD users coming from Linux. Additionally, the man page was incorrect about the strftime format. There are three time formats that may be displayed in the STARTED column depending on the age of the process. Below is an example. For a process started at 14:30 on Monday 16 March 2015, the following formats may be used: 14:30 for process < 24h old (24h Timestamp) Mon14 for process > 24h, < 1 week old (Weekday Hour) 16Mar15 for process > 1 week old (Day Month Year) Differential Revision: https://reviews.freebsd.org/D1620 Reviewed by: brd Approved by: trasz --- bin/ps/print.c | 9 ++------- bin/ps/ps.1 | 4 ++-- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/bin/ps/print.c b/bin/ps/print.c index bcd451e1fb59..40ecd07d0318 100644 --- a/bin/ps/print.c +++ b/bin/ps/print.c @@ -383,7 +383,6 @@ started(KINFO *k, VARENT *ve __unused) { time_t then; struct tm *tp; - static int use_ampm = -1; size_t buflen = 100; char *buf; @@ -394,16 +393,12 @@ started(KINFO *k, VARENT *ve __unused) if (buf == NULL) errx(1, "malloc failed"); - if (use_ampm < 0) - use_ampm = (*nl_langinfo(T_FMT_AMPM) != '\0'); then = k->ki_p->ki_start.tv_sec; tp = localtime(&then); if (now - k->ki_p->ki_start.tv_sec < 24 * 3600) { - (void)strftime(buf, buflen, - use_ampm ? "%l:%M%p" : "%k:%M ", tp); + (void)strftime(buf, buflen, "%H:%M ", tp); } else if (now - k->ki_p->ki_start.tv_sec < 7 * 86400) { - (void)strftime(buf, buflen, - use_ampm ? "%a%I%p" : "%a%H ", tp); + (void)strftime(buf, buflen, "%a%H ", tp); } else (void)strftime(buf, buflen, "%e%b%y", tp); return (buf); diff --git a/bin/ps/ps.1 b/bin/ps/ps.1 index 7e26dd905a74..6eead7606890 100644 --- a/bin/ps/ps.1 +++ b/bin/ps/ps.1 @@ -381,12 +381,12 @@ the real memory (resident set) size of the process (in 1024 byte units). The time the command started. If the command started less than 24 hours ago, the start time is displayed using the -.Dq Li %l:ps.1p +.Dq Li %H:%M format described in .Xr strftime 3 . If the command started less than 7 days ago, the start time is displayed using the -.Dq Li %a6.15p +.Dq Li %a%H format. Otherwise, the start time is displayed using the .Dq Li %e%b%y