[BusyBox-cvs] busybox/procps uptime.c,1.18,1.19

[Erik Andersen]

Update of /var/cvs/busybox/procps
In directory nail:/tmp/cvs-serv13435/procps

Modified Files:
	uptime.c 
Log Message:
Simplify, make formatting better match the procps version


Index: uptime.c
===================================================================
RCS file: /var/cvs/busybox/procps/uptime.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- a/uptime.c	15 Mar 2004 08:29:04 -0000	1.18
+++ b/uptime.c	6 Apr 2004 11:10:50 -0000	1.19
@@ -53,9 +53,8 @@
 
 	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" : "");