Fixed option parsing. Grep would continue grepping, even when given a bad /

[oweals/busybox.git] / uptime.c

diff --git a/uptime.c b/uptime.c
index 6a8bfa638264be56c9c4ed9127242fded8b24829..6758d959ec81829e3547f65d84902251252da65f 100644 (file)
--- 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 "internal.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)
@@ -46,32 +49,29 @@ extern int uptime_main(int argc, char **argv)
        struct tm *current_time;
        time_t current_secs;
 
-       if (argc > 1 && strcmp(argv[1], "--help") == 0)
-               usage(uptime_usage);
-
        time(&current_secs);
        current_time = localtime(&current_secs);
 
        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;
 }