X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=procps%2Fuptime.c;h=5c48795bf2f73a72c3139aef87ceab11bfd2f721;hb=b507cc3aceda26eff851230223a62c6fb471573c;hp=a974313d74f6f7f2415f10bcf2410bb5b5e6027d;hpb=cb81e6484d1f50ec2761f6294722407b14add525;p=oweals%2Fbusybox.git

diff --git a/procps/uptime.c b/procps/uptime.c
index a974313d7..5c48795bf 100644
--- a/procps/uptime.c
+++ b/procps/uptime.c
@@ -2,22 +2,9 @@
 /*
  * Mini uptime implementation for busybox
  *
- * Copyright (C) 1999-2003 by Erik Andersen <andersen@codepoet.org>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
  *
+ * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 
 /* This version of uptime doesn't display the number of users on the system,
@@ -28,20 +15,18 @@
 
 /* getopt not needed */
 
+#include "libbb.h"
 
-#include <stdio.h>
-#include <time.h>
-#include <errno.h>
-#include <stdlib.h>
-#include "busybox.h"
-
-static const int FSHIFT = 16;              /* nr of bits of precision */
+#ifndef FSHIFT
+# define FSHIFT 16              /* nr of bits of precision */
+#endif
 #define FIXED_1         (1<<FSHIFT)     /* 1.0 as fixed-point */
 #define LOAD_INT(x) ((x) >> FSHIFT)
 #define LOAD_FRAC(x) LOAD_INT(((x) & (FIXED_1-1)) * 100)
 
 
-extern int uptime_main(int argc, char **argv)
+int uptime_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int uptime_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
 {
 	int updays, uphours, upminutes;
 	struct sysinfo info;
@@ -53,23 +38,22 @@ 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" : "");
 	upminutes = (int) info.uptime / 60;
 	uphours = (upminutes / 60) % 24;
 	upminutes %= 60;
-	if(uphours)
+	if (uphours)
 		printf("%2d:%02d, ", uphours, upminutes);
 	else
 		printf("%d min, ", upminutes);
 
-	printf("load average: %ld.%02ld, %ld.%02ld, %ld.%02ld\n", 
-			LOAD_INT(info.loads[0]), LOAD_FRAC(info.loads[0]), 
-			LOAD_INT(info.loads[1]), LOAD_FRAC(info.loads[1]), 
+	printf("load average: %ld.%02ld, %ld.%02ld, %ld.%02ld\n",
+			LOAD_INT(info.loads[0]), LOAD_FRAC(info.loads[0]),
+			LOAD_INT(info.loads[1]), LOAD_FRAC(info.loads[1]),
 			LOAD_INT(info.loads[2]), LOAD_FRAC(info.loads[2]));
 
 	return EXIT_SUCCESS;