iostat: add forgotted fclose(); fix default count.

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

diff --git a/procps/iostat.c b/procps/iostat.c
index 8641c2391d9b4aa57d14c0b6c1a407bfb76cb1a9..76c5353ccbe0d6f7722e50a96f1c899d61501a05 100644 (file)
--- a/procps/iostat.c
+++ b/procps/iostat.c
@@ -20,8 +20,8 @@
 #include "libbb.h"
 #include <sys/utsname.h>       /* Need struct utsname */
 
-#define debug(fmt, ...) fprintf(stderr, fmt, ## __VA_ARGS__)
-//#define debug(fmt, ...) ((void)0)
+//#define debug(fmt, ...) fprintf(stderr, fmt, ## __VA_ARGS__)
+#define debug(fmt, ...) ((void)0)
 
 #define MAX_DEVICE_NAME                12
 #define CURRENT                                0
@@ -402,6 +402,8 @@ static void do_disk_statistics(cputime_t itv)
                                continue;
                }
        }
+
+       fclose(fp);
 }
 
 static void dev_report(cputime_t itv)
@@ -493,7 +495,7 @@ int iostat_main(int argc, char **argv)
 {
        int opt, dev_num;
        unsigned interval = 0;
-       int count = 0;
+       int count;
        cputime_t global_uptime[2] = { 0 };
        cputime_t smp_uptime[2] = { 0 };
        cputime_t itv;
@@ -537,10 +539,11 @@ int iostat_main(int argc, char **argv)
                argv++;
        }
 
+       count = 1;
        if (*argv) {
                /* Get interval */
                interval = xatoi_positive(*argv);
-               count = interval ? -1 : 1;
+               count = (interval != 0 ? -1 : 1);
                argv++;
                if (*argv)
                        /* Get count value */