emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2010-08-12 15:36:34 +02:00
parent 7783248eaa
commit dcaed97e0f
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
procps/iostat.c
View File

@ -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 */