Merge commit 'c0cae52662ccced9df19f19ec94238d1b1e3bd71' into merge

Conflicts:
	Makefile.flags
	scripts/basic/fixdep.c

5 files changed, 140 insertions, 32 deletions

diff --git a/procps/Config.src b/procps/Config.src
index 570b026da..5cd47c84f 100644
--- a/procps/Config.src
+++ b/procps/Config.src
@@ -90,12 +90,20 @@ config PS
 config FEATURE_PS_WIDE
         bool "Enable wide output option (-w)"
         default y
-        depends on PS
+        depends on PS && !DESKTOP
         help
           Support argument 'w' for wide output.
           If given once, 132 chars are printed, and if given more
           than once, the length is unlimited.
 
+config FEATURE_PS_LONG
+        bool "Enable long output option (-l)"
+        default y
+        depends on PS && !DESKTOP
+        help
+          Support argument 'l' for long output.
+          Adds fields PPID, RSS, START, TIME & TTY
+
 config FEATURE_PS_TIME
         bool "Enable time and elapsed time output"
         default y
diff --git a/procps/nmeter.c b/procps/nmeter.c
index 999955982..ed5479024 100644
--- a/procps/nmeter.c
+++ b/procps/nmeter.c
@@ -274,30 +274,56 @@ static int rdval_loadavg(const char* p, ullong *vec, ...)
 //   1  2 3   4  5        6(rd)  7      8     9     10(wr) 11     12 13     14
 //   3  0 hda 51292 14441 841783 926052 25717 79650 843256 3029804 0 148459 3956933
 //   3  1 hda1 0 0 0 0 <- ignore if only 4 fields
+// Linux 3.0 (maybe earlier) started printing full stats for hda1 too.
+// Had to add code which skips such devices.
 static int rdval_diskstats(const char* p, ullong *vec)
 {
-        ullong rd = rd; // for compiler
-        int indexline = 0;
+        char devname[32];
+        unsigned devname_len = 0;
+        int value_idx = 0;
+
         vec[0] = 0;
         vec[1] = 0;
         while (1) {
-                indexline++;
-                while (*p == ' ' || *p == '\t') p++;
-                if (*p == '\0') break;
+                value_idx++;
+                while (*p == ' ' || *p == '\t')
+                        p++;
+                if (*p == '\0')
+                        break;
                 if (*p == '\n') {
-                        indexline = 0;
+                        value_idx = 0;
                         p++;
                         continue;
                 }
-                if (indexline == 6) {
-                        rd = strtoull(p, NULL, 10);
-                } else if (indexline == 10) {
-                        vec[0] += rd;  // TODO: *sectorsize (don't know how to find out sectorsize)
+                if (value_idx == 3) {
+                        char *end = strchrnul(p, ' ');
+                        /* If this a hda1-like device (same prefix as last one + digit)? */
+                        if (devname_len && strncmp(devname, p, devname_len) == 0 && isdigit(p[devname_len])) {
+                                p = end;
+                                goto skip_line; /* skip entire line */
+                        }
+                        /* It is not. Remember the name for future checks */
+                        devname_len = end - p;
+                        if (devname_len > sizeof(devname)-1)
+                                devname_len = sizeof(devname)-1;
+                        strncpy(devname, p, devname_len);
+                        /* devname[devname_len] = '\0'; - not really needed */
+                        p = end;
+                } else
+                if (value_idx == 6) {
+                        // TODO: *sectorsize (don't know how to find out sectorsize)
+                        vec[0] += strtoull(p, NULL, 10);
+                } else
+                if (value_idx == 10) {
+                        // TODO: *sectorsize (don't know how to find out sectorsize)
                         vec[1] += strtoull(p, NULL, 10);
-                        while (*p != '\n' && *p != '\0') p++;
+ skip_line:
+                        while (*p != '\n' && *p != '\0')
+                                p++;
                         continue;
                 }
-                while (*p > ' ') p++; // skip over value
+                while ((unsigned char)(*p) > ' ') // skip over value
+                        p++;
         }
         return 0;
 }
diff --git a/procps/ps.c b/procps/ps.c
index af57f7aee..aa004aa22 100644
--- a/procps/ps.c
+++ b/procps/ps.c
@@ -39,6 +39,12 @@
 //usage:        IF_FEATURE_PS_WIDE(
 //usage:     "\n        w       Wide output"
 //usage:        )
+//usage:        IF_FEATURE_PS_LONG(
+//usage:     "\n        l       Long output"
+//usage:        )
+//usage:        IF_FEATURE_SHOW_THREADS(
+//usage:     "\n        T       Show threads"
+//usage:        )
 //usage:
 //usage:#endif /* ENABLE_DESKTOP */
 //usage:
@@ -56,15 +62,15 @@
 //usage:       " 2990 andersen andersen R ps\n"
 
 #include "libbb.h"
+#ifdef __linux__
+# include <sys/sysinfo.h>
+#endif
 
 /* Absolute maximum on output line length */
 enum { MAX_WIDTH = 2*1024 };
 
 #if ENABLE_DESKTOP
 
-#ifdef __linux__
-# include <sys/sysinfo.h>
-#endif
 #include <sys/times.h> /* for times() */
 #ifndef AT_CLKTCK
 # define AT_CLKTCK 17
@@ -635,15 +641,21 @@ int ps_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
         enum {
                 OPT_Z = (1 << 0) * ENABLE_SELINUX,
                 OPT_T = (1 << ENABLE_SELINUX) * ENABLE_FEATURE_SHOW_THREADS,
+                OPT_l = (1 << ENABLE_SELINUX) * (1 << ENABLE_FEATURE_SHOW_THREADS) * ENABLE_FEATURE_PS_LONG,
         };
+#if ENABLE_FEATURE_PS_LONG
+        time_t now = now;
+        struct sysinfo info;
+#endif
         int opts = 0;
         /* If we support any options, parse argv */
-#if ENABLE_SELINUX || ENABLE_FEATURE_SHOW_THREADS || ENABLE_FEATURE_PS_WIDE
+#if ENABLE_SELINUX || ENABLE_FEATURE_SHOW_THREADS || ENABLE_FEATURE_PS_WIDE || ENABLE_FEATURE_PS_LONG
 # if ENABLE_FEATURE_PS_WIDE
         /* -w is a bit complicated */
         int w_count = 0;
         opt_complementary = "-:ww";
-        opts = getopt32(argv, IF_SELINUX("Z")IF_FEATURE_SHOW_THREADS("T")"w", &w_count);
+        opts = getopt32(argv, IF_SELINUX("Z")IF_FEATURE_SHOW_THREADS("T")IF_FEATURE_PS_LONG("l")
+                                        "w", &w_count);
         /* if w is given once, GNU ps sets the width to 132,
          * if w is given more than once, it is "unlimited"
          */
@@ -658,23 +670,51 @@ int ps_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
 # else
         /* -w is not supported, only -Z and/or -T */
         opt_complementary = "-";
-        opts = getopt32(argv, IF_SELINUX("Z")IF_FEATURE_SHOW_THREADS("T"));
+        opts = getopt32(argv, IF_SELINUX("Z")IF_FEATURE_SHOW_THREADS("T")IF_FEATURE_PS_LONG("l"));
 # endif
-#endif
 
-#if ENABLE_SELINUX
+# if ENABLE_SELINUX
         if ((opts & OPT_Z) && is_selinux_enabled()) {
                 psscan_flags = PSSCAN_PID | PSSCAN_CONTEXT
                                 | PSSCAN_STATE | PSSCAN_COMM;
                 puts("  PID CONTEXT                          STAT COMMAND");
         } else
+# endif
+        if (opts & OPT_l) {
+                psscan_flags = PSSCAN_STATE | PSSCAN_UIDGID | PSSCAN_PID | PSSCAN_PPID
+                        | PSSCAN_TTY | PSSCAN_STIME | PSSCAN_UTIME | PSSCAN_COMM
+                        | PSSCAN_VSZ | PSSCAN_RSS;
+/* http://pubs.opengroup.org/onlinepubs/9699919799/utilities/ps.html
+ * mandates for -l:
+ * -F     Flags (?)
+ * S      State
+ * UID,PID,PPID
+ * -C     CPU usage
+ * -PRI   The priority of the process; higher numbers mean lower priority
+ * -NI    Nice value
+ * -ADDR  The address of the process (?)
+ * SZ     The size in blocks of the core image
+ * -WCHAN The event for which the process is waiting or sleeping
+ * TTY
+ * TIME   The cumulative execution time
+ * CMD
+ * We don't show fields marked with '-'.
+ * We show VSZ and RSS instead of SZ.
+ * We also show STIME (standard says that -f shows it, -l doesn't).
+ */
+                puts("S   UID   PID  PPID   VSZ   RSS TTY   STIME TIME     CMD");
+#if ENABLE_FEATURE_PS_LONG
+                now = time(NULL);
+                sysinfo(&info);
 #endif
-        {
+        }
+        else {
                 puts("  PID USER       VSZ STAT COMMAND");
         }
         if (opts & OPT_T) {
                 psscan_flags |= PSSCAN_TASKS;
         }
+#endif
 
         p = NULL;
         while ((p = procps_scan(p, psscan_flags)) != NULL) {
@@ -688,15 +728,49 @@ int ps_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
                 } else
 #endif
                 {
-                        const char *user = get_cached_username(p->uid);
-                        //if (p->vsz == 0)
-                        //      len = printf("%5u %-8.8s        %s ",
-                        //              p->pid, user, p->state);
-                        //else
+                        char buf6[6];
+                        smart_ulltoa5(p->vsz, buf6, " mgtpezy");
+                        buf6[5] = '\0';
+#if ENABLE_FEATURE_PS_LONG
+                        if (opts & OPT_l) {
+                                char bufr[6], stime_str[6];
+                                char tty[2 * sizeof(int)*3 + 2];
+                                char *endp;
+                                unsigned sut = (p->stime + p->utime) / 100;
+                                unsigned elapsed = info.uptime - (p->start_time / 100);
+                                time_t start = now - elapsed;
+                                struct tm *tm = localtime(&start);
+
+                                smart_ulltoa5(p->rss, bufr, " mgtpezy");
+                                bufr[5] = '\0';
+
+                                if (p->tty_major == 136)
+                                        /* It should be pts/N, not ptsN, but N > 9
+                                         * will overflow field width...
+                                         */
+                                        endp = stpcpy(tty, "pts");
+                                else
+                                if (p->tty_major == 4) {
+                                        endp = stpcpy(tty, "tty");
+                                        if (p->tty_minor >= 64) {
+                                                p->tty_minor -= 64;
+                                                *endp++ = 'S';
+                                        }
+                                }
+                                else
+                                        endp = tty + sprintf(tty, "%d:", p->tty_major);
+                                strcpy(endp, utoa(p->tty_minor));
+
+                                strftime(stime_str, 6, (elapsed >= (24 * 60 * 60)) ? "%b%d" : "%H:%M", tm);
+                                stime_str[5] = '\0';
+                                //            S  UID PID PPID VSZ RSS TTY STIME TIME        CMD
+                                len = printf("%c %5u %5u %5u %5s %5s %-5s %s %02u:%02u:%02u ",
+                                        p->state[0], p->uid, p->pid, p->ppid, buf6, bufr, tty,
+                                        stime_str, sut / 3600, (sut % 3600) / 60, sut % 60);
+                        } else
+#endif
                         {
-                                char buf6[6];
-                                smart_ulltoa5(p->vsz, buf6, " mgtpezy");
-                                buf6[5] = '\0';
+                                const char *user = get_cached_username(p->uid);
                                 len = printf("%5u %-8.8s %s %s  ",
                                         p->pid, user, buf6, p->state);
                         }
diff --git a/procps/smemcap.c b/procps/smemcap.c
index e108d88ad..9d1126a49 100644
--- a/procps/smemcap.c
+++ b/procps/smemcap.c
@@ -20,7 +20,7 @@
 //config:         a memory usage statistic tool.
 
 #include "libbb.h"
-#include "archive.h"
+#include "bb_archive.h"
 
 struct fileblock {
         struct fileblock *next;
diff --git a/procps/top.c b/procps/top.c
index 011bbf183..15eb624cc 100644
--- a/procps/top.c
+++ b/procps/top.c
@@ -126,7 +126,6 @@ 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        )
@@ -143,6 +142,7 @@ struct BUG_bad_size {
 #define num_cpus         (G.num_cpus          )
 #define total_pcpu       (G.total_pcpu        )
 #define line_buf         (G.line_buf          )
+#define INIT_G() do { } while (0)
 
 enum {
         OPT_d = (1 << 0),