diff options
| author | Eric Andersen <andersen@codepoet.org> | 2004-04-06 11:10:50 +0000 |
|---|---|---|
| committer | Eric Andersen <andersen@codepoet.org> | 2004-04-06 11:10:50 +0000 |
| commit | ba9b22a8ccd1f7fb3e5e002731178b910e6a5f1a (patch) | |
| tree | 03a6e01b18f3ddb2b5456f409a078e6660d709c6 | |
| parent | 650fe63467e693990cf357c51b74db3278088a56 (diff) | |
| download | busybox-w32-ba9b22a8ccd1f7fb3e5e002731178b910e6a5f1a.tar.gz busybox-w32-ba9b22a8ccd1f7fb3e5e002731178b910e6a5f1a.tar.bz2 busybox-w32-ba9b22a8ccd1f7fb3e5e002731178b910e6a5f1a.zip | |
Simplify, make formatting better match the procps version
| -rw-r--r-- | procps/uptime.c | 5 |
1 files changed, 2 insertions, 3 deletions
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) | |||
| 53 | 53 | ||
| 54 | sysinfo(&info); | 54 | sysinfo(&info); |
| 55 | 55 | ||
| 56 | printf(" %2d:%02d%s up ", | 56 | printf(" %02d:%02d:%02d up ", |
| 57 | current_time->tm_hour%12 ? current_time->tm_hour%12 : 12, | 57 | current_time->tm_hour, current_time->tm_min, current_time->tm_sec); |
| 58 | current_time->tm_min, current_time->tm_hour > 11 ? "pm" : "am"); | ||
| 59 | updays = (int) info.uptime / (60*60*24); | 58 | updays = (int) info.uptime / (60*60*24); |
| 60 | if (updays) | 59 | if (updays) |
| 61 | printf("%d day%s, ", updays, (updays != 1) ? "s" : ""); | 60 | printf("%d day%s, ", updays, (updays != 1) ? "s" : ""); |