X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=uptime.c;h=6758d959ec81829e3547f65d84902251252da65f;hb=4391a16c92cef744fc715cb7347b7b71fc8f312e;hp=fe4e48cd6106f289264eafa8170232bf67fb3b96;hpb=3570a34de46b1f7dedd16999bb1687e2d6b55d40;p=oweals%2Fbusybox.git

diff --git a/uptime.c b/uptime.c
index fe4e48cd6..6758d959e 100644
--- a/uptime.c
+++ b/uptime.c
@@ -2,7 +2,7 @@
 /*
  * Mini uptime implementation for busybox
  *
- * Copyright (C) 1999,2000 by Lineo, inc.
+ * Copyright (C) 1999,2000,2001 by Lineo, inc.
  * Written by Erik Andersen <andersen@lineo.com>, <andersee@debian.org>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -24,16 +24,19 @@
 /* This version of uptime doesn't display the number of users on the system,
  * since busybox init doesn't mess with utmp.  For folks using utmp that are
  * just dying to have # of users reported, feel free to write it as some type
- * of BB_FEATURE_UMTP_SUPPORT #define
+ * of BB_FEATURE_UTMP_SUPPORT #define
  */
 
+/* getopt not needed */
+
 
-#include "busybox.h"
 #include <stdio.h>
 #include <time.h>
 #include <errno.h>
+#include <stdlib.h>
+#include "busybox.h"
 
-#define FSHIFT          16              /* nr of bits of precision */
+static const int FSHIFT = 16;              /* nr of bits of precision */
 #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)
@@ -51,24 +54,24 @@ extern int uptime_main(int argc, char **argv)
 
 	sysinfo(&info);
 
-	fprintf(stdout, " %2d:%02d%s  up ", 
+	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");
 	updays = (int) info.uptime / (60*60*24);
 	if (updays)
-		fprintf(stdout, "%d day%s, ", updays, (updays != 1) ? "s" : "");
+		printf("%d day%s, ", updays, (updays != 1) ? "s" : "");
 	upminutes = (int) info.uptime / 60;
 	uphours = (upminutes / 60) % 24;
 	upminutes %= 60;
 	if(uphours)
-		fprintf(stdout, "%2d:%02d, ", uphours, upminutes);
+		printf("%2d:%02d, ", uphours, upminutes);
 	else
-		fprintf(stdout, "%d min, ", upminutes);
+		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]), 
 			LOAD_INT(info.loads[2]), LOAD_FRAC(info.loads[2]));
 
-	return(TRUE);
+	return EXIT_SUCCESS;
 }