hardenedbsd/HardenedBSD
1
0
Fork 0
mirror of https://git.hardenedbsd.org/hardenedbsd/HardenedBSD.git synced 2024-11-26 10:53:39 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use 24h timestamps in the ps(1) STARTED column

Browse Source 
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
This commit is contained in:
Mark Felder 2015-03-17 12:40:33 +00:00
parent 3e8c6d74bb
commit c2290ff6b8
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=280171
2 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
bin/ps/print.c
View File

@ -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);

4
bin/ps/ps.1
View File

@ -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