mirrors/coreutils
0
0
Fork 0
mirror of https://github.com/coreutils/coreutils.git synced 2024-11-24 10:23:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

uptime: remove inconsistent AM/PM from current time

Browse Source 
* src/uptime.c (main): 00-23 was always used for the hour component
of the current time, so remove the AM/PM output (which was only
present in some locales anyway).  Also add seconds to the time
to be more consistent with the usual procps-ng uptime implementation
on GNU/Linux.
* NEWS: Mention the fix.
Fixes http://bugs.gnu.org/26783
This commit is contained in:
Prateek saxena 2017-05-11 12:46:02 +01:00 committed by Pádraig Brady
parent 42192c5177
commit 82911c51ae
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
NEWS
View File

@ -26,6 +26,10 @@ GNU coreutils NEWS -*- outline -*-
tail -F 'dir/file' is now monitored even when 'dir' is replaced.
[bug introduced with inotify support added in coreutils-7.5]
uptime no longer outputs the AM/PM component of the current time,
as that's inconsistent with the 24 hour time format used.
[bug introduced in coreutils-7.0]
** New features
expand and unexpand now support specifying an offset for tab stops

2
src/uptime.c
View File

@ -134,7 +134,7 @@ print_uptime (size_t n, const STRUCT_UTMP *this)
previous versions of coreutils don't. */
if (tmn)
/* TRANSLATORS: This prints the current clock time. */
fprintftime (stdout, _(" %H:%M%P "), tmn, 0, 0);
fprintftime (stdout, _(" %H:%M:%S "), tmn, 0, 0);
else
printf (_(" ??:???? "));
if (uptime == (time_t) -1)