From: Eric Andersen <andersen@codepoet.org>
Date: Tue, 6 Apr 2004 11:10:50 +0000 (-0000)
Subject: Simplify, make formatting better match the procps version
X-Git-Tag: 1_00_pre9~27
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=ba9b22a8ccd1f7fb3e5e002731178b910e6a5f1a;p=oweals%2Fbusybox.git

Simplify, make formatting better match the procps version
---

diff --git a/procps/uptime.c b/procps/uptime.c
index 7e0735c44..38d58af9c 100644
--- a/procps/uptime.c
+++ b/procps/uptime.c
@@ -53,9 +53,8 @@ extern int uptime_main(int argc, char **argv)
 
 	sysinfo(&info);
 
-	printf(" %2d:%02d%s  up ",
-			current_time->tm_hour%12 ? current_time->tm_hour%12 : 12,
-			current_time->tm_min, current_time->tm_hour > 11 ? "pm" : "am");
+	printf(" %02d:%02d:%02d up ",
+			current_time->tm_hour, current_time->tm_min, current_time->tm_sec);
 	updays = (int) info.uptime / (60*60*24);
 	if (updays)
 		printf("%d day%s, ", updays, (updays != 1) ? "s" : "");