Merge branch 'origin/master' (early part)

4 files changed, 52 insertions, 2 deletions

diff --git a/libbb/Kbuild.src b/libbb/Kbuild.src
index a4f77414b..a6a163f3e 100644
--- a/libbb/Kbuild.src
+++ b/libbb/Kbuild.src
@@ -158,6 +158,9 @@ lib-$(CONFIG_MOUNT) += find_mount_point.o
 lib-$(CONFIG_HWCLOCK) += rtc.o
 lib-$(CONFIG_RTCWAKE) += rtc.o
 
+lib-$(CONFIG_IOSTAT) += get_cpu_count.o
+lib-$(CONFIG_MPSTAT) += get_cpu_count.o
+
 # We shouldn't build xregcomp.c if we don't need it - this ensures we don't
 # require regex.h to be in the include dir even if we don't need it thereby
 # allowing us to build busybox even if uclibc regex support is disabled.
diff --git a/libbb/appletlib.c b/libbb/appletlib.c
index cae7da48a..b470f30f9 100644
--- a/libbb/appletlib.c
+++ b/libbb/appletlib.c
@@ -9,7 +9,7 @@
  * Based in part on code from sash, Copyright (c) 1999 by David I. Bell
  * Permission has been granted to redistribute this code under the GPL.
  *
- * Licensed under GPLv2 or later, see file License in this tarball for details.
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
 /* We are trying to not use printf, this benefits the case when selected
diff --git a/libbb/get_cpu_count.c b/libbb/get_cpu_count.c
new file mode 100644
index 000000000..edb7e6d37
--- /dev/null
+++ b/libbb/get_cpu_count.c
@@ -0,0 +1,47 @@
+/* vi: set sw=4 ts=4: */
+/*
+ * Factored out of mpstat/iostat.
+ *
+ * Copyright (C) 2010 Marek Polacek <mmpolacek@gmail.com>
+ *
+ * Licensed under GPLv2, see file LICENSE in this tarball for details.
+ */
+#include "libbb.h"
+
+/* Does str start with "cpu"? */
+int FAST_FUNC starts_with_cpu(const char *str)
+{
+        return ((str[0] - 'c') | (str[1] - 'p') | (str[2] - 'u')) == 0;
+}
+
+/*
+ * Get number of processors. Uses /proc/stat.
+ * Return value 0 means one CPU and non SMP kernel.
+ * Otherwise N means N processor(s) and SMP kernel.
+ */
+unsigned FAST_FUNC get_cpu_count(void)
+{
+        FILE *fp;
+        char line[256];
+        int proc_nr = -1;
+
+        fp = xfopen_for_read("/proc/stat");
+        while (fgets(line, sizeof(line), fp)) {
+                if (!starts_with_cpu(line)) {
+                        if (proc_nr >= 0)
+                                break; /* we are past "cpuN..." lines */
+                        continue;
+                }
+                if (line[3] != ' ') { /* "cpuN" */
+                        int num_proc;
+                        if (sscanf(line + 3, "%u", &num_proc) == 1
+                         && num_proc > proc_nr
+                        ) {
+                                proc_nr = num_proc;
+                        }
+                }
+        }
+
+        fclose(fp);
+        return proc_nr + 1;
+}
diff --git a/libbb/strrstr.c b/libbb/strrstr.c
index a803dd983..d201f5172 100644
--- a/libbb/strrstr.c
+++ b/libbb/strrstr.c
@@ -4,7 +4,7 @@
  *
  * Copyright (C) 2008 Bernhard Reutner-Fischer
  *
- * Licensed under GPLv2 or later, see file License in this tarball for details.
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
 #ifdef __DO_STRRSTR_TEST