summaryrefslogtreecommitdiff
path: root/procps
diff options
context:
space:
mode:
authorEric Andersen2004-04-06 11:10:50 +0000
committerEric Andersen2004-04-06 11:10:50 +0000
commitba9b22a8ccd1f7fb3e5e002731178b910e6a5f1a (patch)
tree03a6e01b18f3ddb2b5456f409a078e6660d709c6 /procps
parent650fe63467e693990cf357c51b74db3278088a56 (diff)
downloadbusybox-ba9b22a8ccd1f7fb3e5e002731178b910e6a5f1a.zip
busybox-ba9b22a8ccd1f7fb3e5e002731178b910e6a5f1a.tar.gz
Simplify, make formatting better match the procps version
Diffstat (limited to 'procps')
-rw-r--r--procps/uptime.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/procps/uptime.c b/procps/uptime.c
index 7e0735c..38d58af 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" : "");