Simplify, make formatting better match the procps version
authorEric Andersen <andersen@codepoet.org>
Tue, 6 Apr 2004 11:10:50 +0000 (11:10 -0000)
committerEric Andersen <andersen@codepoet.org>
Tue, 6 Apr 2004 11:10:50 +0000 (11:10 -0000)
procps/uptime.c

index 7e0735c444eba5c09b6924657c48f02fc9fb2b78..38d58af9c4a50fbb633f5f0b2ee8b92165116991 100644 (file)
@@ -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" : "");