libbb: factor out common code from mpstat/iostat

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

1 files changed, 3 insertions, 27 deletions

diff --git a/procps/iostat.c b/procps/iostat.c
index 76c5353cc..e8e321b8d 100644
--- a/procps/iostat.c
+++ b/procps/iostat.c
@@ -114,26 +114,6 @@ static void print_header(void)
                         buf, uts.machine, G.total_cpus);
 }
 
-static int get_number_of_cpus(void)
-{
-#ifdef _SC_NPROCESSORS_CONF
-        return sysconf(_SC_NPROCESSORS_CONF);
-#else
-        char buf[128];
-        int n = 0;
-        FILE *fp;
-
-        fp = xfopen_for_read("/proc/cpuinfo");
-
-        while (fgets(buf, sizeof(buf), fp))
-                if (strncmp(buf, "processor\t:", 11) == 0)
-                        n++;
-
-        fclose(fp);
-        return n;
-#endif
-}
-
 static void get_localtime(struct tm *ptm)
 {
         time_t timer;
@@ -148,12 +128,6 @@ static void print_timestamp(void)
         printf("%s\n", buf);
 }
 
-/* Does str start with "cpu"? */
-static int starts_with_cpu(const char *str)
-{
-        return ((str[0] - 'c') | (str[1] - 'p') | (str[2] - 'u')) == 0;
-}
-
 /* Fetch CPU statistics from /proc/stat */
 static void get_cpu_statistics(struct stats_cpu *sc)
 {
@@ -509,7 +483,9 @@ int iostat_main(int argc, char **argv)
         G.clk_tck = get_user_hz();
 
         /* Determine number of CPUs */
-        G.total_cpus = get_number_of_cpus();
+        G.total_cpus = get_cpu_count();
+        if (G.total_cpus == 0)
+                G.total_cpus = 1;
 
         /* Parse and process arguments */
         /* -k and -m are mutually exclusive */