Author: feld (ports committer) Date: Tue Mar 17 12:40:33 2015 New Revision: 280171 URL: https://svnweb.freebsd.org/changeset/base/280171
Log: 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 Modified: head/bin/ps/print.c head/bin/ps/ps.1 Modified: head/bin/ps/print.c ============================================================================== --- head/bin/ps/print.c Tue Mar 17 12:40:26 2015 (r280170) +++ head/bin/ps/print.c Tue Mar 17 12:40:33 2015 (r280171) @@ -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); Modified: head/bin/ps/ps.1 ============================================================================== --- head/bin/ps/ps.1 Tue Mar 17 12:40:26 2015 (r280170) +++ head/bin/ps/ps.1 Tue Mar 17 12:40:33 2015 (r280171) @@ -381,12 +381,12 @@ the real memory (resident set) size of t 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 _______________________________________________ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
