Merge branch 'origin/master' (early part)

3 files changed, 79 insertions, 120 deletions

diff --git a/procps/Config.in b/procps/Config.src
index 6a9a36638..01f6b0cf9 100644
--- a/procps/Config.in
+++ b/procps/Config.src
@@ -7,7 +7,7 @@ menu "Process Utilities"
 
 config FREE
         bool "free"
-        default n
+        default y
         help
           free displays the total amount of free and used physical and swap
           memory in the system, as well as the buffers used by the kernel.
@@ -15,7 +15,7 @@ config FREE
 
 config FUSER
         bool "fuser"
-        default n
+        default y
         help
           fuser lists all PIDs (Process IDs) that currently have a given
           file open. fuser can also list all PIDs that have a given network
@@ -23,7 +23,7 @@ config FUSER
 
 config KILL
         bool "kill"
-        default n
+        default y
         help
           The command kill sends the specified signal to the specified
           process or process group. If no signal is specified, the TERM
@@ -31,7 +31,7 @@ config KILL
 
 config KILLALL
         bool "killall"
-        default n
+        default y
         depends on KILL
         help
           killall sends a signal to all processes running any of the
@@ -40,38 +40,38 @@ config KILLALL
 
 config KILLALL5
         bool "killall5"
-        default n
+        default y
         depends on KILL
 
 config NMETER
         bool "nmeter"
-        default n
+        default y
         help
           Prints selected system stats continuously, one line per update.
 
 config PGREP
         bool "pgrep"
-        default n
+        default y
         help
           Look for processes by name.
 
 config PIDOF
         bool "pidof"
-        default n
+        default y
         help
           Pidof finds the process id's (pids) of the named programs. It prints
           those id's on the standard output.
 
 config FEATURE_PIDOF_SINGLE
         bool "Enable argument for single shot (-s)"
-        default n
+        default y
         depends on PIDOF
         help
           Support argument '-s' for returning only the first pid found.
 
 config FEATURE_PIDOF_OMIT
         bool "Enable argument for omitting pids (-o)"
-        default n
+        default y
         depends on PIDOF
         help
           Support argument '-o' for omitting the given pids in output.
@@ -80,19 +80,19 @@ config FEATURE_PIDOF_OMIT
 
 config PKILL
         bool "pkill"
-        default n
+        default y
         help
           Send signals to processes by name.
 
 config PS
         bool "ps"
-        default n
+        default y
         help
           ps gives a snapshot of the current processes.
 
 config FEATURE_PS_WIDE
         bool "Enable wide output option (-w)"
-        default n
+        default y
         depends on PS
         help
           Support argument 'w' for wide output.
@@ -101,14 +101,14 @@ config FEATURE_PS_WIDE
 
 config FEATURE_PS_TIME
         bool "Enable time and elapsed time output"
-        default n
+        default y
         depends on PS && DESKTOP
         help
           Support -o time and -o etime output specifiers.
 
 config FEATURE_PS_ADDITIONAL_COLUMNS
         bool "Enable additional ps columns"
-        default n
+        default y
         depends on PS && DESKTOP
         help
           Support -o rgroup, -o ruser, -o nice output specifiers.
@@ -123,20 +123,20 @@ config FEATURE_PS_UNUSUAL_SYSTEMS
 
 config RENICE
         bool "renice"
-        default n
+        default y
         help
           Renice alters the scheduling priority of one or more running
           processes.
 
 config BB_SYSCTL
         bool "sysctl"
-        default n
+        default y
         help
           Configure kernel parameters at runtime.
 
 config TOP
         bool "top"
-        default n
+        default y
         help
           The top program provides a dynamic real-time view of a running
           system.
@@ -159,7 +159,7 @@ config FEATURE_TOP_CPU_GLOBAL_PERCENTS
 
 config FEATURE_TOP_SMP_CPU
         bool "SMP CPU usage display ('c' key)"
-        default n
+        default y
         depends on FEATURE_TOP_CPU_GLOBAL_PERCENTS
         help
           Allow 'c' key to switch between individual/cumulative CPU stats
@@ -167,7 +167,7 @@ config FEATURE_TOP_SMP_CPU
 
 config FEATURE_TOP_DECIMALS
         bool "Show 1/10th of a percent in CPU/mem statistics"
-        default n
+        default y
         depends on FEATURE_TOP_CPU_USAGE_PERCENTAGE
         help
           Show 1/10th of a percent in CPU/mem statistics.
@@ -175,7 +175,7 @@ config FEATURE_TOP_DECIMALS
 
 config FEATURE_TOP_SMP_PROCESS
         bool "Show CPU process runs on ('j' field)"
-        default n
+        default y
         depends on TOP
         help
           Show CPU where process was last found running on.
@@ -183,21 +183,21 @@ config FEATURE_TOP_SMP_PROCESS
 
 config FEATURE_TOPMEM
         bool "Topmem command ('s' key)"
-        default n
+        default y
         depends on TOP
         help
           Enable 's' in top (gives lots of memory info).
 
 config FEATURE_SHOW_THREADS
         bool "Support for showing threads in ps/top"
-        default n
+        default y
         depends on PS || TOP
         help
           Enables ps -T option and 'h' command in top
 
 config UPTIME
         bool "uptime"
-        default n
+        default y
         help
           uptime gives a one line display of the current time, how long
           the system has been running, how many users are currently logged
@@ -205,7 +205,7 @@ config UPTIME
 
 config WATCH
         bool "watch"
-        default n
+        default y
         help
           watch is used to execute a program periodically, showing
           output to the screen.
diff --git a/procps/Kbuild b/procps/Kbuild.src
index 8e62fdfa6..8e62fdfa6 100644
--- a/procps/Kbuild
+++ b/procps/Kbuild.src
diff --git a/procps/top.c b/procps/top.c
index e4afafc4c..04dd82633 100644
--- a/procps/top.c
+++ b/procps/top.c
@@ -103,11 +103,11 @@ struct globals {
 }; //FIX_ALIASING; - large code growth
 enum { LINE_BUF_SIZE = COMMON_BUFSIZE - offsetof(struct globals, line_buf) };
 #define G (*(struct globals*)&bb_common_bufsiz1)
-#define INIT_G() do { \
-        struct G_sizecheck { \
-                char G_sizecheck[sizeof(G) > COMMON_BUFSIZE ? -1 : 1]; \
-        }; \
-} while (0)
+struct BUG_bad_size {
+        char BUG_G_too_big[sizeof(G) <= COMMON_BUFSIZE ? 1 : -1];
+        char BUG_line_buf_too_small[LINE_BUF_SIZE > 80 ? 1 : -1];
+};
+#define INIT_G() do { } while (0)
 #define top              (G.top               )
 #define ntop             (G.ntop              )
 #define sort_field       (G.sort_field        )
@@ -696,111 +696,70 @@ static int topmem_sort(char *a, char *b)
         return inverted ? -n : n;
 }
 
-/* Cut "NNNN" out of "    NNNN kb" */
-static char *grab_number(char *str, const char *match, unsigned sz)
-{
-        if (strncmp(str, match, sz) == 0) {
-                str = skip_whitespace(str + sz);
-                (skip_non_whitespace(str))[0] = '\0';
-                return xstrdup(str);
-        }
-        return NULL;
-}
-
 /* display header info (meminfo / loadavg) */
 static void display_topmem_header(int scr_width, int *lines_rem_p)
 {
-        char linebuf[128];
+        enum {
+                TOTAL = 0, MFREE, BUF, CACHE,
+                SWAPTOTAL, SWAPFREE, DIRTY,
+                MWRITE, ANON, MAP, SLAB,
+                NUM_FIELDS
+        };
+        static const char match[NUM_FIELDS][12] = {
+                "\x09" "MemTotal:",  // TOTAL
+                "\x08" "MemFree:",   // MFREE
+                "\x08" "Buffers:",   // BUF
+                "\x07" "Cached:",    // CACHE
+                "\x0a" "SwapTotal:", // SWAPTOTAL
+                "\x09" "SwapFree:",  // SWAPFREE
+                "\x06" "Dirty:",     // DIRTY
+                "\x0a" "Writeback:", // MWRITE
+                "\x0a" "AnonPages:", // ANON
+                "\x07" "Mapped:",    // MAP
+                "\x05" "Slab:",      // SLAB
+        };
+        char meminfo_buf[4 * 1024];
+        const char *Z[NUM_FIELDS];
         unsigned i;
-        FILE *fp;
-        union {
-                struct {
-                        /*  1 */ char *total;
-                        /*  2 */ char *mfree;
-                        /*  3 */ char *buf;
-                        /*  4 */ char *cache;
-                        /*  5 */ char *swaptotal;
-                        /*  6 */ char *swapfree;
-                        /*  7 */ char *dirty;
-                        /*  8 */ char *mwrite;
-                        /*  9 */ char *anon;
-                        /* 10 */ char *map;
-                        /* 11 */ char *slab;
-                } u;
-                char *str[11];
-        } Z;
-#define total     Z.u.total
-#define mfree     Z.u.mfree
-#define buf       Z.u.buf
-#define cache     Z.u.cache
-#define swaptotal Z.u.swaptotal
-#define swapfree  Z.u.swapfree
-#define dirty     Z.u.dirty
-#define mwrite    Z.u.mwrite
-#define anon      Z.u.anon
-#define map       Z.u.map
-#define slab      Z.u.slab
-#define str       Z.str
-
-        memset(&Z, 0, sizeof(Z));
+        int sz;
+
+        for (i = 0; i < NUM_FIELDS; i++)
+                Z[i] = "?";
 
         /* read memory info */
-        fp = xfopen_for_read("meminfo");
-        while (fgets(linebuf, sizeof(linebuf), fp)) {
-                char *p;
-
-#define SCAN(match, name) \
-                p = grab_number(linebuf, match, sizeof(match)-1); \
-                if (p) { name = p; continue; }
-
-                SCAN("MemTotal:", total);
-                SCAN("MemFree:", mfree);
-                SCAN("Buffers:", buf);
-                SCAN("Cached:", cache);
-                SCAN("SwapTotal:", swaptotal);
-                SCAN("SwapFree:", swapfree);
-                SCAN("Dirty:", dirty);
-                SCAN("Writeback:", mwrite);
-                SCAN("AnonPages:", anon);
-                SCAN("Mapped:", map);
-                SCAN("Slab:", slab);
-#undef SCAN
+        sz = open_read_close("meminfo", meminfo_buf, sizeof(meminfo_buf) - 1);
+        if (sz >= 0) {
+                char *p = meminfo_buf;
+                meminfo_buf[sz] = '\0';
+                /* Note that fields always appear in the match[] order */
+                for (i = 0; i < NUM_FIELDS; i++) {
+                        char *found = strstr(p, match[i] + 1);
+                        if (found) {
+                                /* Cut "NNNN" out of "    NNNN kb" */
+                                char *s = skip_whitespace(found + match[i][0]);
+                                p = skip_non_whitespace(s);
+                                *p++ = '\0';
+                                Z[i] = s;
+                        }
+                }
         }
-        fclose(fp);
 
-#define S(s) (s ? s : "0")
-        snprintf(linebuf, sizeof(linebuf),
+        snprintf(line_buf, LINE_BUF_SIZE,
                 "Mem total:%s anon:%s map:%s free:%s",
-                S(total), S(anon), S(map), S(mfree));
-        printf(OPT_BATCH_MODE ? "%.*s\n" : "\033[H\033[J%.*s\n", scr_width, linebuf);
+                Z[TOTAL], Z[ANON], Z[MAP], Z[MFREE]);
+        printf(OPT_BATCH_MODE ? "%.*s\n" : "\033[H\033[J%.*s\n", scr_width, line_buf);
 
-        snprintf(linebuf, sizeof(linebuf),
+        snprintf(line_buf, LINE_BUF_SIZE,
                 " slab:%s buf:%s cache:%s dirty:%s write:%s",
-                S(slab), S(buf), S(cache), S(dirty), S(mwrite));
-        printf("%.*s\n", scr_width, linebuf);
+                Z[SLAB], Z[BUF], Z[CACHE], Z[DIRTY], Z[MWRITE]);
+        printf("%.*s\n", scr_width, line_buf);
 
-        snprintf(linebuf, sizeof(linebuf),
+        snprintf(line_buf, LINE_BUF_SIZE,
                 "Swap total:%s free:%s", // TODO: % used?
-                S(swaptotal), S(swapfree));
-        printf("%.*s\n", scr_width, linebuf);
+                Z[SWAPTOTAL], Z[SWAPFREE]);
+        printf("%.*s\n", scr_width, line_buf);
 
         (*lines_rem_p) -= 3;
-#undef S
-
-        for (i = 0; i < ARRAY_SIZE(str); i++)
-                free(str[i]);
-#undef total
-#undef free
-#undef buf
-#undef cache
-#undef swaptotal
-#undef swapfree
-#undef dirty
-#undef write
-#undef anon
-#undef map
-#undef slab
-#undef str
 }
 
 static void ulltoa6_and_space(unsigned long long ul, char buf[6])