aboutsummaryrefslogtreecommitdiff
path: root/procps/uptime.c
diff options
context:
space:
mode:
authorandersen <andersen@69ca8d6d-28ef-0310-b511-8ec308f3f277>2004-03-15 08:29:22 +0000
committerandersen <andersen@69ca8d6d-28ef-0310-b511-8ec308f3f277>2004-03-15 08:29:22 +0000
commitb16674f3c1a961e0b5d6a57745f5f749d95c641e (patch)
tree4c6d2217f4d8306c59cf1096f8664e1cfd167213 /procps/uptime.c
parente7135df4a650f9197b633784472f45602524855b (diff)
downloadbusybox-w32-b16674f3c1a961e0b5d6a57745f5f749d95c641e.tar.gz
busybox-w32-b16674f3c1a961e0b5d6a57745f5f749d95c641e.tar.bz2
busybox-w32-b16674f3c1a961e0b5d6a57745f5f749d95c641e.zip
Remove trailing whitespace. Update copyright to include 2004.
git-svn-id: svn://busybox.net/trunk/busybox@8630 69ca8d6d-28ef-0310-b511-8ec308f3f277
Diffstat (limited to 'procps/uptime.c')
-rw-r--r--procps/uptime.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/procps/uptime.c b/procps/uptime.c
index a974313d7..7e0735c44 100644
--- a/procps/uptime.c
+++ b/procps/uptime.c
@@ -2,7 +2,7 @@
2/* 2/*
3 * Mini uptime implementation for busybox 3 * Mini uptime implementation for busybox
4 * 4 *
5 * Copyright (C) 1999-2003 by Erik Andersen <andersen@codepoet.org> 5 * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
6 * 6 *
7 * This program is free software; you can redistribute it and/or modify 7 * This program is free software; you can redistribute it and/or modify
8 * it under the terms of the GNU General Public License as published by 8 * it under the terms of the GNU General Public License as published by
@@ -53,8 +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(" %2d:%02d%s up ",
57 current_time->tm_hour%12 ? current_time->tm_hour%12 : 12, 57 current_time->tm_hour%12 ? current_time->tm_hour%12 : 12,
58 current_time->tm_min, current_time->tm_hour > 11 ? "pm" : "am"); 58 current_time->tm_min, current_time->tm_hour > 11 ? "pm" : "am");
59 updays = (int) info.uptime / (60*60*24); 59 updays = (int) info.uptime / (60*60*24);
60 if (updays) 60 if (updays)
@@ -67,9 +67,9 @@ extern int uptime_main(int argc, char **argv)
67 else 67 else
68 printf("%d min, ", upminutes); 68 printf("%d min, ", upminutes);
69 69
70 printf("load average: %ld.%02ld, %ld.%02ld, %ld.%02ld\n", 70 printf("load average: %ld.%02ld, %ld.%02ld, %ld.%02ld\n",
71 LOAD_INT(info.loads[0]), LOAD_FRAC(info.loads[0]), 71 LOAD_INT(info.loads[0]), LOAD_FRAC(info.loads[0]),
72 LOAD_INT(info.loads[1]), LOAD_FRAC(info.loads[1]), 72 LOAD_INT(info.loads[1]), LOAD_FRAC(info.loads[1]),
73 LOAD_INT(info.loads[2]), LOAD_FRAC(info.loads[2])); 73 LOAD_INT(info.loads[2]), LOAD_FRAC(info.loads[2]));
74 74
75 return EXIT_SUCCESS; 75 return EXIT_SUCCESS;