7 files changed, 32 insertions, 25 deletions

diff --git a/procps/free.c b/procps/free.c
index 3acfc4072..1e5d36742 100644
--- a/procps/free.c
+++ b/procps/free.c
@@ -44,6 +44,7 @@ struct globals {
 #else
 # define G_unit_steps 10
 #endif
+        unsigned long cached_kb, available_kb, reclaimable_kb;
 };
 /* Because of NOFORK, "globals" are not in global data */
 
@@ -53,27 +54,30 @@ static unsigned long long scale(struct globals *g, unsigned long d)
 }
 
 /* NOINLINE reduces main() stack usage, which makes code smaller (on x86 at least) */
-static NOINLINE unsigned int parse_meminfo(unsigned long *cached_kb, unsigned long *available_kb)
+static NOINLINE unsigned int parse_meminfo(struct globals *g)
 {
         char buf[60]; /* actual lines we expect are ~30 chars or less */
         FILE *fp;
-        int seen_cached_and_available;
+        int seen_cached_and_available_and_reclaimable;
 
         fp = xfopen_for_read("/proc/meminfo");
-        *cached_kb = *available_kb = 0;
-        seen_cached_and_available = 2;
+        g->cached_kb = g->available_kb = g->reclaimable_kb = 0;
+        seen_cached_and_available_and_reclaimable = 3;
         while (fgets(buf, sizeof(buf), fp)) {
-                if (sscanf(buf, "Cached: %lu %*s\n", cached_kb) == 1)
-                        if (--seen_cached_and_available == 0)
+                if (sscanf(buf, "Cached: %lu %*s\n", &g->cached_kb) == 1)
+                        if (--seen_cached_and_available_and_reclaimable == 0)
                                 break;
-                if (sscanf(buf, "MemAvailable: %lu %*s\n", available_kb) == 1)
-                        if (--seen_cached_and_available == 0)
+                if (sscanf(buf, "MemAvailable: %lu %*s\n", &g->available_kb) == 1)
+                        if (--seen_cached_and_available_and_reclaimable == 0)
+                                break;
+                if (sscanf(buf, "SReclaimable: %lu %*s\n", &g->reclaimable_kb) == 1)
+                        if (--seen_cached_and_available_and_reclaimable == 0)
                                 break;
         }
         /* Have to close because of NOFORK */
         fclose(fp);
 
-        return seen_cached_and_available == 0;
+        return seen_cached_and_available_and_reclaimable == 0;
 }
 
 int free_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
@@ -82,7 +86,6 @@ int free_main(int argc UNUSED_PARAM, char **argv IF_NOT_DESKTOP(UNUSED_PARAM))
         struct globals G;
         struct sysinfo info;
         unsigned long long cached, cached_plus_free, available;
-        unsigned long cached_kb, available_kb;
         int seen_available;
 
 #if ENABLE_DESKTOP
@@ -118,10 +121,11 @@ int free_main(int argc UNUSED_PARAM, char **argv IF_NOT_DESKTOP(UNUSED_PARAM))
         /* 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 and memavailable from /proc/meminfo and convert to mem_units */
-        seen_available = parse_meminfo(&cached_kb, &available_kb);
-        available = ((unsigned long long) available_kb * 1024) / G.mem_unit;
-        cached = ((unsigned long long) cached_kb * 1024) / G.mem_unit;
+        seen_available = parse_meminfo(&G);
+        available = ((unsigned long long) G.available_kb * 1024) / G.mem_unit;
+        cached = ((unsigned long long) G.cached_kb * 1024) / G.mem_unit;
         cached += info.bufferram;
+        cached += ((unsigned long long) G.reclaimable_kb * 1024) / G.mem_unit;
         cached_plus_free = cached + info.freeram;
 
 #define FIELDS_6 "%12llu %11llu %11llu %11llu %11llu %11llu\n"
diff --git a/procps/kill.c b/procps/kill.c
index 073e74332..358d8f42b 100644
--- a/procps/kill.c
+++ b/procps/kill.c
@@ -270,7 +270,7 @@ int kill_main(int argc UNUSED_PARAM, char **argv)
 #if ENABLE_KILL || ENABLE_KILLALL
         /* Pid or name is required for kill/killall */
         if (!arg) {
-                bb_error_msg("you need to specify whom to kill");
+                bb_simple_error_msg("you need to specify whom to kill");
                 return EXIT_FAILURE;
         }
 
diff --git a/procps/mpstat.c b/procps/mpstat.c
index e7dc4312a..3e07edc5c 100644
--- a/procps/mpstat.c
+++ b/procps/mpstat.c
@@ -931,7 +931,7 @@ int mpstat_main(int argc UNUSED_PARAM, char **argv)
                                 /* Get CPU number */
                                 unsigned n = xatoi_positive(t);
                                 if (n >= G.cpu_nr)
-                                        bb_error_msg_and_die("not that many processors");
+                                        bb_simple_error_msg_and_die("not that many processors");
                                 n++;
                                 G.cpu_bitmap[n >> 3] |= 1 << (n & 7);
                         }
diff --git a/procps/nmeter.c b/procps/nmeter.c
index a01d19a6a..f0eb36740 100644
--- a/procps/nmeter.c
+++ b/procps/nmeter.c
@@ -351,7 +351,7 @@ static s_stat* init_cr(const char *param UNUSED_PARAM)
 enum { CPU_FIELDCNT = 7 };
 S_STAT(cpu_stat)
         ullong old[CPU_FIELDCNT];
-        int bar_sz;
+        unsigned bar_sz;
         char bar[1];
 S_STAT_END(cpu_stat)
 
@@ -360,8 +360,8 @@ static void FAST_FUNC collect_cpu(cpu_stat *s)
         ullong data[CPU_FIELDCNT] = { 0, 0, 0, 0, 0, 0, 0 };
         unsigned frac[CPU_FIELDCNT] = { 0, 0, 0, 0, 0, 0, 0 };
         ullong all = 0;
-        int norm_all = 0;
-        int bar_sz = s->bar_sz;
+        unsigned norm_all = 0;
+        unsigned bar_sz = s->bar_sz;
         char *bar = s->bar;
         int i;
 
@@ -420,8 +420,8 @@ static s_stat* init_cpu(const char *param)
 {
         int sz;
         cpu_stat *s;
-        sz = strtoul(param, NULL, 0); /* param can be "" */
-        if (sz < 10) sz = 10;
+        sz = param[0] ? strtoul(param, NULL, 0) : 10;
+        if (sz <= 0) sz = 1;
         if (sz > 1000) sz = 1000;
         s = xzalloc(sizeof(*s) + sz);
         /*s->bar[sz] = '\0'; - xzalloc did it */
diff --git a/procps/powertop.c b/procps/powertop.c
index e70f5433b..d508b5f78 100644
--- a/procps/powertop.c
+++ b/procps/powertop.c
@@ -657,7 +657,7 @@ static void show_timerstats(void)
                 }
         } else {
                 bb_putchar('\n');
-                bb_error_msg("no stats available; run as root or"
+                bb_simple_error_msg("no stats available; run as root or"
                                 " enable the timer_stats module");
         }
 }
@@ -707,7 +707,7 @@ int powertop_main(int argc UNUSED_PARAM, char UNUSED_PARAM **argv)
 
         /* Print warning when we don't have superuser privileges */
         if (geteuid() != 0)
-                bb_error_msg("run as root to collect enough information");
+                bb_simple_error_msg("run as root to collect enough information");
 
         /* Get number of CPUs */
         G.total_cpus = get_cpu_count();
diff --git a/procps/pstree.c b/procps/pstree.c
index 1d124d2d2..67b711168 100644
--- a/procps/pstree.c
+++ b/procps/pstree.c
@@ -404,7 +404,7 @@ int pstree_main(int argc UNUSED_PARAM, char **argv)
         else {
                 dump_by_user(find_proc(1), uid);
                 if (!G.dumped) {
-                        bb_error_msg_and_die("no processes found");
+                        bb_simple_error_msg_and_die("no processes found");
                 }
         }
 
diff --git a/procps/top.c b/procps/top.c
index 89f9d23f4..5c41e8e10 100644
--- a/procps/top.c
+++ b/procps/top.c
@@ -979,6 +979,9 @@ static unsigned handle_input(unsigned scan_mask, duration_t interval)
                 IF_FEATURE_TOPMEM(&& scan_mask != TOPMEM_MASK)
                 ) {
                         scan_mask ^= PSSCAN_TASKS;
+                        free(prev_hist);
+                        prev_hist = NULL;
+                        prev_hist_count = 0;
                         continue;
                 }
 # endif
@@ -1000,10 +1003,10 @@ static unsigned handle_input(unsigned scan_mask, duration_t interval)
 #  if ENABLE_FEATURE_TOPMEM
                 if (c == 's') {
                         scan_mask = TOPMEM_MASK;
+                        sort_field = (sort_field + 1) % NUM_SORT_FIELD;
                         free(prev_hist);
                         prev_hist = NULL;
                         prev_hist_count = 0;
-                        sort_field = (sort_field + 1) % NUM_SORT_FIELD;
                         continue;
                 }
 #  endif
@@ -1229,7 +1232,7 @@ int top_main(int argc UNUSED_PARAM, char **argv)
 #endif
                 } /* end of "while we read /proc" */
                 if (ntop == 0) {
-                        bb_error_msg("no process info in /proc");
+                        bb_simple_error_msg("no process info in /proc");
                         break;
                 }