4 files changed, 56 insertions, 45 deletions

diff --git a/procps/free.c b/procps/free.c
index 47f2fc3b2..0d023f740 100644
--- a/procps/free.c
+++ b/procps/free.c
@@ -44,11 +44,28 @@ static unsigned long long scale(unsigned long d)
         return ((unsigned long long)d * G.mem_unit) >> G_unit_steps;
 }
 
+static unsigned long parse_cached_kb(void)
+{
+        char buf[60]; /* actual lines we expect are ~30 chars or less */
+        FILE *fp;
+        unsigned long cached = 0;
+
+        fp = xfopen_for_read("/proc/meminfo");
+        while (fgets(buf, sizeof(buf), fp) != NULL) {
+                if (sscanf(buf, "Cached: %lu %*s\n", &cached) == 1)
+                        break;
+        }
+        if (ENABLE_FEATURE_CLEAN_UP)
+                fclose(fp);
+
+        return cached;
+}
 
 int free_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int free_main(int argc UNUSED_PARAM, char **argv IF_NOT_DESKTOP(UNUSED_PARAM))
 {
         struct sysinfo info;
+        unsigned long long cached;
 
         INIT_G();
 
@@ -73,49 +90,47 @@ int free_main(int argc UNUSED_PARAM, char **argv IF_NOT_DESKTOP(UNUSED_PARAM))
                 }
         }
 #endif
-
-        sysinfo(&info);
-
-        /* Kernels prior to 2.4.x will return info.mem_unit==0, so cope... */
-        G.mem_unit = (info.mem_unit ? info.mem_unit : 1);
-
-        printf("     %13s%13s%13s%13s%13s\n",
+        printf("       %11s%11s%11s%11s%11s%11s\n"
+        "Mem:   ",
                 "total",
                 "used",
                 "free",
-                "shared", "buffers" /* swap and total don't have these columns */
-                /* procps version 3.2.8 also shows "cached" column, but
-                 * sysinfo() does not provide this value, need to parse
-                 * /proc/meminfo instead and get "Cached: NNN kB" from there.
-                 */
+                "shared", "buffers", "cached" /* swap and total don't have these columns */
         );
 
-#define FIELDS_5 "%13llu%13llu%13llu%13llu%13llu\n"
-#define FIELDS_3 (FIELDS_5 + 2*6)
-#define FIELDS_2 (FIELDS_5 + 3*6)
+        sysinfo(&info);
+        /* Kernels prior to 2.4.x will return info.mem_unit==0, so cope... */
+        G.mem_unit = (info.mem_unit ? info.mem_unit : 1);
+        /* Extract cached from /proc/meminfo and convert to mem_units */
+        cached = ((unsigned long long) parse_cached_kb() * 1024) / G.mem_unit;
+
+#define FIELDS_6 "%11llu%11llu%11llu%11llu%11llu%11llu\n"
+#define FIELDS_3 (FIELDS_6 + 3*6)
+#define FIELDS_2 (FIELDS_6 + 4*6)
 
-        printf("Mem: ");
-        printf(FIELDS_5,
-                scale(info.totalram),
-                scale(info.totalram - info.freeram),
-                scale(info.freeram),
-                scale(info.sharedram),
-                scale(info.bufferram)
+        printf(FIELDS_6,
+                scale(info.totalram),                //total
+                scale(info.totalram - info.freeram), //used
+                scale(info.freeram),                 //free
+                scale(info.sharedram),               //shared
+                scale(info.bufferram),               //buffers
+                scale(cached)                        //cached
         );
         /* Show alternate, more meaningful busy/free numbers by counting
-         * buffer cache as free memory (make it "-/+ buffers/cache"
-         * if/when we add support for "cached" column): */
-        printf("-/+ buffers:      ");
+         * buffer cache as free memory. */
+        printf("-/+ buffers/cache:");
+        cached += info.freeram;
+        cached += info.bufferram;
         printf(FIELDS_2,
-                scale(info.totalram - info.freeram - info.bufferram),
-                scale(info.freeram + info.bufferram)
+                scale(info.totalram - cached), //used
+                scale(cached)                  //free
         );
 #if BB_MMU
-        printf("Swap:");
+        printf("Swap:  ");
         printf(FIELDS_3,
-                scale(info.totalswap),
-                scale(info.totalswap - info.freeswap),
-                scale(info.freeswap)
+                scale(info.totalswap),                 //total
+                scale(info.totalswap - info.freeswap), //used
+                scale(info.freeswap)                   //free
         );
 #endif
         return EXIT_SUCCESS;
diff --git a/procps/mpstat.c b/procps/mpstat.c
index c628d6215..6028903fa 100644
--- a/procps/mpstat.c
+++ b/procps/mpstat.c
@@ -522,13 +522,11 @@ static void get_irqs_from_stat(struct stats_irq *irq)
         FILE *fp;
         char buf[1024];
 
-        fp = fopen_for_read(PROCFS_STAT);
-        if (!fp)
-                return;
+        fp = xfopen_for_read(PROCFS_STAT);
 
         while (fgets(buf, sizeof(buf), fp)) {
                 //bb_error_msg("/proc/stat:'%s'", buf);
-                if (strncmp(buf, "intr ", 5) == 0) {
+                if (is_prefixed_with(buf, "intr ")) {
                         /* Read total number of IRQs since system boot */
                         sscanf(buf + 5, "%"FMT_DATA"u", &irq->irq_nr);
                 }
@@ -644,9 +642,7 @@ static void get_uptime(data_t *uptime)
         char buf[sizeof(long)*3 * 2 + 4]; /* enough for long.long */
         unsigned long uptime_sec, decimal;
 
-        fp = fopen_for_read(PROCFS_UPTIME);
-        if (!fp)
-                return;
+        fp = xfopen_for_read(PROCFS_UPTIME);
         if (fgets(buf, sizeof(buf), fp)) {
                 if (sscanf(buf, "%lu.%lu", &uptime_sec, &decimal) == 2) {
                         *uptime = (data_t)uptime_sec * G.hz + decimal * G.hz / 100;
diff --git a/procps/powertop.c b/procps/powertop.c
index e3c29d1c3..1de5d329e 100644
--- a/procps/powertop.c
+++ b/procps/powertop.c
@@ -360,7 +360,7 @@ static void process_irq_counts(void)
                 }
 
                 name = p;
-                strchrnul(name, '\n')[0] = '\0';
+                chomp(p);
                 /* Save description of the interrupt */
                 if (nr >= 20000)
                         sprintf(irq_desc, "   <kernel IPI> : %s", name);
@@ -458,9 +458,9 @@ static NOINLINE int process_timer_stats(void)
                         //      func = "Load balancing tick";
                         //}
 
-                        if (strncmp(func, "tick_nohz_", 10) == 0)
+                        if (is_prefixed_with(func, "tick_nohz_"))
                                 continue;
-                        if (strncmp(func, "tick_setup_sched_timer", 20) == 0)
+                        if (is_prefixed_with(func, "tick_setup_sched_timer"))
                                 continue;
                         //if (strcmp(process, "powertop") == 0)
                         //      continue;
@@ -470,7 +470,7 @@ static NOINLINE int process_timer_stats(void)
                                 process = idx < 2 ? "[kernel module]" : "<kernel core>";
                         }
 
-                        strchrnul(p, '\n')[0] = '\0';
+                        chomp(p);
 
                         // 46D\01136\0kondemand/1\0do_dbs_timer (delayed_work_timer_fn)
                         // ^          ^            ^
@@ -674,7 +674,7 @@ static void show_timerstats(void)
 //usage:#define powertop_trivial_usage
 //usage:       ""
 //usage:#define powertop_full_usage "\n\n"
-//usage:       "Analyze power consumption on Intel-based laptops\n"
+//usage:       "Analyze power consumption on Intel-based laptops"
 
 int powertop_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int powertop_main(int UNUSED_PARAM argc, char UNUSED_PARAM **argv)
diff --git a/procps/pwdx.c b/procps/pwdx.c
index 781810488..4e34149ed 100644
--- a/procps/pwdx.c
+++ b/procps/pwdx.c
@@ -21,7 +21,7 @@
 //usage:#define pwdx_trivial_usage
 //usage:       "PID..."
 //usage:#define pwdx_full_usage "\n\n"
-//usage:       "Show current directory for PIDs\n"
+//usage:       "Show current directory for PIDs"
 
 #include "libbb.h"
 
@@ -41,7 +41,7 @@ int pwdx_main(int argc UNUSED_PARAM, char **argv)
                 // Allowed on the command line:
                 // /proc/NUM
                 // NUM
-                if (strncmp(arg, "/proc/", 6) == 0)
+                if (is_prefixed_with(arg, "/proc/"))
                         arg += 6;
 
                 pid = bb_strtou(arg, NULL, 10);