Bump to version 1.22.1
[platform/upstream/busybox.git] / procps / ps.c
index 08922eb..c65fa01 100644 (file)
  *
  * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
  * Fix for SELinux Support:(c)2007 Hiroshi Shinji <shiroshi@my.email.ne.jp>
                          (c)2007 Yuichi Nakamura <ynakam@hitachisoft.jp>
*                         (c)2007 Yuichi Nakamura <ynakam@hitachisoft.jp>
  *
- * Licensed under the GPL version 2, see the file LICENSE in this tarball.
+ * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 
+//usage:#if ENABLE_DESKTOP
+//usage:
+//usage:#define ps_trivial_usage
+//usage:       "[-o COL1,COL2=HEADER]" IF_FEATURE_SHOW_THREADS(" [-T]")
+//usage:#define ps_full_usage "\n\n"
+//usage:       "Show list of processes\n"
+//usage:     "\n       -o COL1,COL2=HEADER     Select columns for display"
+//usage:       IF_FEATURE_SHOW_THREADS(
+//usage:     "\n       -T                      Show threads"
+//usage:       )
+//usage:
+//usage:#else /* !ENABLE_DESKTOP */
+//usage:
+//usage:#if !ENABLE_SELINUX && !ENABLE_FEATURE_PS_WIDE
+//usage:#define USAGE_PS "\nThis version of ps accepts no options"
+//usage:#else
+//usage:#define USAGE_PS ""
+//usage:#endif
+//usage:
+//usage:#define ps_trivial_usage
+//usage:       ""
+//usage:#define ps_full_usage "\n\n"
+//usage:       "Show list of processes\n"
+//usage:       USAGE_PS
+//usage:       IF_SELINUX(
+//usage:     "\n       -Z      Show selinux context"
+//usage:       )
+//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:
+//usage:#define ps_example_usage
+//usage:       "$ ps\n"
+//usage:       "  PID  Uid      Gid State Command\n"
+//usage:       "    1 root     root     S init\n"
+//usage:       "    2 root     root     S [kflushd]\n"
+//usage:       "    3 root     root     S [kupdate]\n"
+//usage:       "    4 root     root     S [kpiod]\n"
+//usage:       "    5 root     root     S [kswapd]\n"
+//usage:       "  742 andersen andersen S [bash]\n"
+//usage:       "  743 andersen andersen S -bash\n"
+//usage:       "  745 root     root     S [getty]\n"
+//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_FEATURE_PS_TIME || ENABLE_FEATURE_PS_LONG
+static unsigned long get_uptime(void)
+{
+#ifdef __linux__
+       struct sysinfo info;
+       if (sysinfo(&info) < 0)
+               return 0;
+       return info.uptime;
+#elif 1
+       unsigned long uptime;
+       char buf[sizeof(uptime)*3 + 2];
+       /* /proc/uptime is "UPTIME_SEC.NN IDLE_SEC.NN\n"
+        * (where IDLE is cumulative over all CPUs)
+        */
+       if (open_read_close("/proc/uptime", buf, sizeof(buf)) <= 0)
+               bb_perror_msg_and_die("can't read '%s'", "/proc/uptime");
+       buf[sizeof(buf)-1] = '\0';
+       sscanf(buf, "%lu", &uptime);
+       return uptime;
+#else
+       struct timespec ts;
+       if (clock_gettime(CLOCK_MONOTONIC, &ts) < 0)
+               return 0;
+       return ts.tv_sec;
+#endif
+}
+#endif
+
 #if ENABLE_DESKTOP
 
+#include <sys/times.h> /* for times() */
+#ifndef AT_CLKTCK
+# define AT_CLKTCK 17
+#endif
+
+/* TODO:
+ * http://pubs.opengroup.org/onlinepubs/9699919799/utilities/ps.html
+ * specifies (for XSI-conformant systems) following default columns
+ * (l and f mark columns shown with -l and -f respectively):
+ * F     l   Flags (octal and additive) associated with the process (??)
+ * S     l   The state of the process
+ * UID   f,l The user ID; the login name is printed with -f
+ * PID       The process ID
+ * PPID  f,l The parent process
+ * C     f,l Processor utilization
+ * PRI   l   The priority of the process; higher numbers mean lower priority
+ * NI    l   Nice value
+ * ADDR  l   The address of the process
+ * SZ    l   The size in blocks of the core image of the process
+ * WCHAN l   The event for which the process is waiting or sleeping
+ * STIME f   Starting time of the process
+ * TTY       The controlling terminal for the process
+ * TIME      The cumulative execution time for the process
+ * CMD       The command name; the full command line is shown with -f
+ */
+typedef struct {
+       uint16_t width;
+       char name6[6];
+       const char *header;
+       void (*f)(char *buf, int size, const procps_status_t *ps);
+       int ps_flags;
+} ps_out_t;
+
+struct globals {
+       ps_out_t* out;
+       int out_cnt;
+       int print_header;
+       int need_flags;
+       char *buffer;
+       unsigned terminal_width;
+#if ENABLE_FEATURE_PS_TIME
+       unsigned kernel_HZ;
+       unsigned long seconds_since_boot;
+#endif
+} FIX_ALIASING;
+#define G (*(struct globals*)&bb_common_bufsiz1)
+#define out                (G.out               )
+#define out_cnt            (G.out_cnt           )
+#define print_header       (G.print_header      )
+#define need_flags         (G.need_flags        )
+#define buffer             (G.buffer            )
+#define terminal_width     (G.terminal_width    )
+#define kernel_HZ          (G.kernel_HZ         )
+#define INIT_G() do { } while (0)
+
+#if ENABLE_FEATURE_PS_TIME
+/* for ELF executables, notes are pushed before environment and args */
+static uintptr_t find_elf_note(uintptr_t findme)
+{
+       uintptr_t *ep = (uintptr_t *) environ;
+
+       while (*ep++)
+               continue;
+       while (*ep) {
+               if (ep[0] == findme) {
+                       return ep[1];
+               }
+               ep += 2;
+       }
+       return -1;
+}
+
+#if ENABLE_FEATURE_PS_UNUSUAL_SYSTEMS
+static unsigned get_HZ_by_waiting(void)
+{
+       struct timeval tv1, tv2;
+       unsigned t1, t2, r, hz;
+       unsigned cnt = cnt; /* for compiler */
+       int diff;
+
+       r = 0;
+
+       /* Wait for times() to reach new tick */
+       t1 = times(NULL);
+       do {
+               t2 = times(NULL);
+       } while (t2 == t1);
+       gettimeofday(&tv2, NULL);
+
+       do {
+               t1 = t2;
+               tv1.tv_usec = tv2.tv_usec;
+
+               /* Wait exactly one times() tick */
+               do {
+                       t2 = times(NULL);
+               } while (t2 == t1);
+               gettimeofday(&tv2, NULL);
+
+               /* Calculate ticks per sec, rounding up to even */
+               diff = tv2.tv_usec - tv1.tv_usec;
+               if (diff <= 0) diff += 1000000;
+               hz = 1000000u / (unsigned)diff;
+               hz = (hz+1) & ~1;
+
+               /* Count how many same hz values we saw */
+               if (r != hz) {
+                       r = hz;
+                       cnt = 0;
+               }
+               cnt++;
+       } while (cnt < 3); /* exit if saw 3 same values */
+
+       return r;
+}
+#else
+static inline unsigned get_HZ_by_waiting(void)
+{
+       /* Better method? */
+       return 100;
+}
+#endif
+
+static unsigned get_kernel_HZ(void)
+{
+       if (kernel_HZ)
+               return kernel_HZ;
+
+       /* Works for ELF only, Linux 2.4.0+ */
+       kernel_HZ = find_elf_note(AT_CLKTCK);
+       if (kernel_HZ == (unsigned)-1)
+               kernel_HZ = get_HZ_by_waiting();
+
+       G.seconds_since_boot = get_uptime();
+
+       return kernel_HZ;
+}
+#endif
+
 /* Print value to buf, max size+1 chars (including trailing '\0') */
 
 static void func_user(char *buf, int size, const procps_status_t *ps)
 {
+#if 1
        safe_strncpy(buf, get_cached_username(ps->uid), size+1);
+#else
+       /* "compatible" version, but it's larger */
+       /* procps 2.18 shows numeric UID if name overflows the field */
+       /* TODO: get_cached_username() returns numeric string if
+        * user has no passwd record, we will display it
+        * left-justified here; too long usernames are shown
+        * as _right-justified_ IDs. Is it worth fixing? */
+       const char *user = get_cached_username(ps->uid);
+       if (strlen(user) <= size)
+               safe_strncpy(buf, user, size+1);
+       else
+               sprintf(buf, "%*u", size, (unsigned)ps->uid);
+#endif
+}
+
+static void func_group(char *buf, int size, const procps_status_t *ps)
+{
+       safe_strncpy(buf, get_cached_groupname(ps->gid), size+1);
 }
 
 static void func_comm(char *buf, int size, const procps_status_t *ps)
@@ -28,9 +269,14 @@ static void func_comm(char *buf, int size, const procps_status_t *ps)
        safe_strncpy(buf, ps->comm, size+1);
 }
 
+static void func_state(char *buf, int size, const procps_status_t *ps)
+{
+       safe_strncpy(buf, ps->state, size+1);
+}
+
 static void func_args(char *buf, int size, const procps_status_t *ps)
 {
-       read_cmdline(buf, size, ps->pid, ps->comm);
+       read_cmdline(buf, size+1, ps->pid, ps->comm);
 }
 
 static void func_pid(char *buf, int size, const procps_status_t *ps)
@@ -50,9 +296,11 @@ static void func_pgid(char *buf, int size, const procps_status_t *ps)
 
 static void put_lu(char *buf, int size, unsigned long u)
 {
-       char buf5[5];
-       smart_ulltoa5( ((unsigned long long)u) << 10, buf5);
-       sprintf(buf, "%.*s", size, buf5);
+       char buf4[5];
+
+       /* see http://en.wikipedia.org/wiki/Tera */
+       smart_ulltoa4(u, buf4, " mgtpezy")[0] = '\0';
+       sprintf(buf, "%.*s", size, buf4);
 }
 
 static void func_vsz(char *buf, int size, const procps_status_t *ps)
@@ -73,27 +321,66 @@ static void func_tty(char *buf, int size, const procps_status_t *ps)
                snprintf(buf, size+1, "%u,%u", ps->tty_major, ps->tty_minor);
 }
 
-#if ENABLE_SELINUX
-static void func_label(char *buf, int size, const procps_status_t *ps)
+#if ENABLE_FEATURE_PS_ADDITIONAL_COLUMNS
+
+static void func_rgroup(char *buf, int size, const procps_status_t *ps)
 {
-       safe_strncpy(buf, ps->context ? ps->context : "unknown", size+1);
+       safe_strncpy(buf, get_cached_groupname(ps->rgid), size+1);
+}
+
+static void func_ruser(char *buf, int size, const procps_status_t *ps)
+{
+       safe_strncpy(buf, get_cached_username(ps->ruid), size+1);
 }
-#endif
 
-/*
 static void func_nice(char *buf, int size, const procps_status_t *ps)
 {
-       ps->???
+       sprintf(buf, "%*d", size, ps->niceness);
 }
 
+#endif
+
+#if ENABLE_FEATURE_PS_TIME
+
 static void func_etime(char *buf, int size, const procps_status_t *ps)
 {
-       elapled time [[dd-]hh:]mm:ss
+       /* elapsed time [[dd-]hh:]mm:ss; here only mm:ss */
+       unsigned long mm;
+       unsigned ss;
+
+       mm = ps->start_time / get_kernel_HZ();
+       /* must be after get_kernel_HZ()! */
+       mm = G.seconds_since_boot - mm;
+       ss = mm % 60;
+       mm /= 60;
+       snprintf(buf, size+1, "%3lu:%02u", mm, ss);
 }
 
 static void func_time(char *buf, int size, const procps_status_t *ps)
 {
-       cumulative time [[dd-]hh:]mm:ss
+       /* cumulative time [[dd-]hh:]mm:ss; here only mm:ss */
+       unsigned long mm;
+       unsigned ss;
+
+       mm = (ps->utime + ps->stime) / get_kernel_HZ();
+       ss = mm % 60;
+       mm /= 60;
+       snprintf(buf, size+1, "%3lu:%02u", mm, ss);
+}
+
+#endif
+
+#if ENABLE_SELINUX
+static void func_label(char *buf, int size, const procps_status_t *ps)
+{
+       safe_strncpy(buf, ps->context ? ps->context : "unknown", size+1);
+}
+#endif
+
+/*
+static void func_nice(char *buf, int size, const procps_status_t *ps)
+{
+       ps->???
 }
 
 static void func_pcpu(char *buf, int size, const procps_status_t *ps)
@@ -101,78 +388,56 @@ static void func_pcpu(char *buf, int size, const procps_status_t *ps)
 }
 */
 
-typedef struct {
-       uint16_t width;
-       char name[6];
-       const char *header;
-       void (*f)(char *buf, int size, const procps_status_t *ps);
-       int ps_flags;
-} ps_out_t;
-
 static const ps_out_t out_spec[] = {
-// Mandated by POSIX:
+/* Mandated by http://pubs.opengroup.org/onlinepubs/9699919799/utilities/ps.html: */
        { 8                  , "user"  ,"USER"   ,func_user  ,PSSCAN_UIDGID  },
+       { 8                  , "group" ,"GROUP"  ,func_group ,PSSCAN_UIDGID  },
        { 16                 , "comm"  ,"COMMAND",func_comm  ,PSSCAN_COMM    },
-       { 256                , "args"  ,"COMMAND",func_args  ,PSSCAN_COMM    },
+       { MAX_WIDTH          , "args"  ,"COMMAND",func_args  ,PSSCAN_COMM    },
        { 5                  , "pid"   ,"PID"    ,func_pid   ,PSSCAN_PID     },
        { 5                  , "ppid"  ,"PPID"   ,func_ppid  ,PSSCAN_PPID    },
        { 5                  , "pgid"  ,"PGID"   ,func_pgid  ,PSSCAN_PGID    },
-//     { sizeof("ELAPSED")-1, "etime" ,"ELAPSED",func_etime ,PSSCAN_        },
-//     { sizeof("GROUP"  )-1, "group" ,"GROUP"  ,func_group ,PSSCAN_UIDGID  },
-//     { sizeof("NI"     )-1, "nice"  ,"NI"     ,func_nice  ,PSSCAN_        },
-//     { sizeof("%CPU"   )-1, "pcpu"  ,"%CPU"   ,func_pcpu  ,PSSCAN_        },
-//     { sizeof("RGROUP" )-1, "rgroup","RGROUP" ,func_rgroup,PSSCAN_UIDGID  },
-//     { sizeof("RUSER"  )-1, "ruser" ,"RUSER"  ,func_ruser ,PSSCAN_UIDGID  },
-//     { sizeof("TIME"   )-1, "time"  ,"TIME"   ,func_time  ,PSSCAN_        },
+#if ENABLE_FEATURE_PS_TIME
+       { sizeof("ELAPSED")-1, "etime" ,"ELAPSED",func_etime ,PSSCAN_START_TIME },
+#endif
+#if ENABLE_FEATURE_PS_ADDITIONAL_COLUMNS
+       { 5                  , "nice"  ,"NI"     ,func_nice  ,PSSCAN_NICE    },
+       { 8                  , "rgroup","RGROUP" ,func_rgroup,PSSCAN_RUIDGID },
+       { 8                  , "ruser" ,"RUSER"  ,func_ruser ,PSSCAN_RUIDGID },
+//     { 5                  , "pcpu"  ,"%CPU"   ,func_pcpu  ,PSSCAN_        },
+#endif
+#if ENABLE_FEATURE_PS_TIME
+       { 6                  , "time"  ,"TIME"   ,func_time  ,PSSCAN_STIME | PSSCAN_UTIME },
+#endif
        { 6                  , "tty"   ,"TT"     ,func_tty   ,PSSCAN_TTY     },
        { 4                  , "vsz"   ,"VSZ"    ,func_vsz   ,PSSCAN_VSZ     },
-// Not mandated by POSIX, but useful:
+/* Not mandated, but useful: */
+       { 4                  , "stat"  ,"STAT"   ,func_state ,PSSCAN_STATE   },
        { 4                  , "rss"   ,"RSS"    ,func_rss   ,PSSCAN_RSS     },
 #if ENABLE_SELINUX
        { 35                 , "label" ,"LABEL"  ,func_label ,PSSCAN_CONTEXT },
 #endif
 };
 
-#if ENABLE_SELINUX
-#define SELINIX_O_PREFIX "label,"
-#define DEFAULT_O_STR    SELINIX_O_PREFIX "pid,user" /* TODO: ,vsz,stat */ ",args"
-#else
-#define DEFAULT_O_STR    "pid,user" /* TODO: ,vsz,stat */ ",args"
-#endif
-
-struct globals {
-       ps_out_t* out;
-       int out_cnt;
-       int print_header;
-       int need_flags;
-       char *buffer;
-       unsigned terminal_width;
-       char default_o[sizeof(DEFAULT_O_STR)];
-};
-#define G (*(struct globals*)&bb_common_bufsiz1)
-#define out            (G.out           )
-#define out_cnt        (G.out_cnt       )
-#define print_header   (G.print_header  )
-#define need_flags     (G.need_flags    )
-#define buffer         (G.buffer        )
-#define terminal_width (G.terminal_width)
-#define default_o      (G.default_o     )
-
 static ps_out_t* new_out_t(void)
 {
-       int i = out_cnt++;
-       out = xrealloc(out, out_cnt * sizeof(*out));
-       return &out[i];
+       out = xrealloc_vector(out, 2, out_cnt);
+       return &out[out_cnt++];
 }
 
 static const ps_out_t* find_out_spec(const char *name)
 {
-       int i;
+       unsigned i;
+       char buf[ARRAY_SIZE(out_spec)*7 + 1];
+       char *p = buf;
+
        for (i = 0; i < ARRAY_SIZE(out_spec); i++) {
-               if (!strcmp(name, out_spec[i].name))
+               if (strncmp(name, out_spec[i].name6, 6) == 0)
                        return &out_spec[i];
+               p += sprintf(p, "%.6s,", out_spec[i].name6);
        }
-       bb_error_msg_and_die("bad -o argument '%s'", name);
+       p[-1] = '\0';
+       bb_error_msg_and_die("bad -o argument '%s', supported arguments: %s", name, buf);
 }
 
 static void parse_o(char* opt)
@@ -214,7 +479,7 @@ static void parse_o(char* opt)
                print_header = 1;
 }
 
-static void post_process(void)
+static void alloc_line_buffer(void)
 {
        int i;
        int width = 0;
@@ -224,6 +489,12 @@ static void post_process(void)
                        print_header = 1;
                }
                width += out[i].width + 1; /* "FIELD " */
+               if ((int)(width - terminal_width) > 0) {
+                       /* The rest does not fit on the screen */
+                       //out[i].width -= (width - terminal_width - 1);
+                       out_cnt = i + 1;
+                       break;
+               }
        }
 #if ENABLE_SELINUX
        if (!is_selinux_enabled())
@@ -278,37 +549,63 @@ static void format_process(const procps_status_t *ps)
        printf("%.*s\n", terminal_width, buffer);
 }
 
+#if ENABLE_SELINUX
+# define SELINUX_O_PREFIX "label,"
+# define DEFAULT_O_STR    (SELINUX_O_PREFIX "pid,user" IF_FEATURE_PS_TIME(",time") ",args")
+#else
+# define DEFAULT_O_STR    ("pid,user" IF_FEATURE_PS_TIME(",time") ",args")
+#endif
+
 int ps_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int ps_main(int argc, char **argv)
+int ps_main(int argc UNUSED_PARAM, char **argv)
 {
        procps_status_t *p;
        llist_t* opt_o = NULL;
-       USE_SELINUX(int opt;)
+       char default_o[sizeof(DEFAULT_O_STR)];
+       int opt;
+       enum {
+               OPT_Z = (1 << 0),
+               OPT_o = (1 << 1),
+               OPT_a = (1 << 2),
+               OPT_A = (1 << 3),
+               OPT_d = (1 << 4),
+               OPT_e = (1 << 5),
+               OPT_f = (1 << 6),
+               OPT_l = (1 << 7),
+               OPT_T = (1 << 8) * ENABLE_FEATURE_SHOW_THREADS,
+       };
+
+       INIT_G();
 
        // POSIX:
        // -a  Write information for all processes associated with terminals
        //     Implementations may omit session leaders from this list
        // -A  Write information for all processes
        // -d  Write information for all processes, except session leaders
-       // -e  Write information for all processes (equivalent to -A.)
+       // -e  Write information for all processes (equivalent to -A)
        // -f  Generate a full listing
        // -l  Generate a long listing
        // -o col1,col2,col3=header
        //     Select which columns to display
-       /* We allow (and ignore) most of the above. FIXME */
+       /* We allow (and ignore) most of the above. FIXME.
+        * -T is picked for threads (POSIX hasn't standardized it).
+        * procps v3.2.7 supports -T and shows tids as SPID column,
+        * it also supports -L where it shows tids as LWP column.
+        */
        opt_complementary = "o::";
-       USE_SELINUX(opt =) getopt32(argv, "Zo:aAdefl", &opt_o);
+       opt = getopt32(argv, "Zo:aAdefl"IF_FEATURE_SHOW_THREADS("T"), &opt_o);
        if (opt_o) {
                do {
-                       parse_o(opt_o->data);
-                       opt_o = opt_o->link;
+                       parse_o(llist_pop(&opt_o));
                } while (opt_o);
        } else {
-               /* Below: parse_o() needs char*, NOT const char*... */
+               /* Below: parse_o() needs char*, NOT const char*,
+                * can't pass it constant string. Need to make a copy first.
+                */
 #if ENABLE_SELINUX
-               if (!(opt & 1) || !is_selinux_enabled()) {
+               if (!(opt & OPT_Z) || !is_selinux_enabled()) {
                        /* no -Z or no SELinux: do not show LABEL */
-                       strcpy(default_o, DEFAULT_O_STR + sizeof(SELINIX_O_PREFIX)-1);
+                       strcpy(default_o, DEFAULT_O_STR + sizeof(SELINUX_O_PREFIX)-1);
                } else
 #endif
                {
@@ -316,7 +613,10 @@ int ps_main(int argc, char **argv)
                }
                parse_o(default_o);
        }
-       post_process();
+#if ENABLE_FEATURE_SHOW_THREADS
+       if (opt & OPT_T)
+               need_flags |= PSSCAN_TASKS;
+#endif
 
        /* Was INT_MAX, but some libc's go belly up with printf("%.*s")
         * and such large widths */
@@ -326,10 +626,11 @@ int ps_main(int argc, char **argv)
                if (--terminal_width > MAX_WIDTH)
                        terminal_width = MAX_WIDTH;
        }
+       alloc_line_buffer();
        format_header();
 
        p = NULL;
-       while ((p = procps_scan(p, need_flags))) {
+       while ((p = procps_scan(p, need_flags)) != NULL) {
                format_process(p);
        }
 
@@ -341,72 +642,146 @@ int ps_main(int argc, char **argv)
 
 
 int ps_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int ps_main(int argc, char **argv)
-{
-       procps_status_t *p = NULL;
-       int len;
-       SKIP_SELINUX(const) int use_selinux = 0;
-       USE_SELINUX(int i;)
-#if !ENABLE_FEATURE_PS_WIDE
-       enum { terminal_width = 79 };
-#else
-       int terminal_width;
-       int w_count = 0;
+int ps_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
+{
+       procps_status_t *p;
+       int psscan_flags = PSSCAN_PID | PSSCAN_UIDGID
+                       | PSSCAN_STATE | PSSCAN_VSZ | PSSCAN_COMM;
+       unsigned terminal_width IF_NOT_FEATURE_PS_WIDE(= 79);
+       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;
+       unsigned long uptime;
 #endif
-
-#if ENABLE_FEATURE_PS_WIDE || ENABLE_SELINUX
-#if ENABLE_FEATURE_PS_WIDE
+       /* If we support any options, parse argv */
+#if ENABLE_SELINUX || ENABLE_FEATURE_SHOW_THREADS || ENABLE_FEATURE_PS_WIDE || ENABLE_FEATURE_PS_LONG
+       int opts = 0;
+# if ENABLE_FEATURE_PS_WIDE
+       /* -w is a bit complicated */
+       int w_count = 0;
        opt_complementary = "-:ww";
-       USE_SELINUX(i =) getopt32(argv, USE_SELINUX("Z") "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"
         */
        if (w_count) {
-               terminal_width = (w_count==1) ? 132 : MAX_WIDTH;
+               terminal_width = (w_count == 1) ? 132 : MAX_WIDTH;
        } else {
                get_terminal_width_height(0, &terminal_width, NULL);
                /* Go one less... */
                if (--terminal_width > MAX_WIDTH)
                        terminal_width = MAX_WIDTH;
        }
-#else /* only ENABLE_SELINUX */
-       i = getopt32(argv, "Z");
-#endif
-#if ENABLE_SELINUX
-       if ((i & 1) && is_selinux_enabled())
-               use_selinux = PSSCAN_CONTEXT;
+# else
+       /* -w is not supported, only -Z and/or -T */
+       opt_complementary = "-";
+       opts = getopt32(argv, IF_SELINUX("Z")IF_FEATURE_SHOW_THREADS("T")IF_FEATURE_PS_LONG("l"));
+# endif
+
+# 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);
+               uptime = get_uptime();
+# endif
+       }
+       else {
+               puts("  PID USER       VSZ STAT COMMAND");
+       }
+       if (opts & OPT_T) {
+               psscan_flags |= PSSCAN_TASKS;
+       }
 #endif
-#endif /* ENABLE_FEATURE_PS_WIDE || ENABLE_SELINUX */
 
-       if (use_selinux)
-               puts("  PID Context                          Stat Command");
-       else
-               puts("  PID  Uid        VSZ Stat Command");
-
-       while ((p = procps_scan(p, 0
-                       | PSSCAN_PID
-                       | PSSCAN_UIDGID
-                       | PSSCAN_STATE
-                       | PSSCAN_VSZ
-                       | PSSCAN_COMM
-                       | use_selinux
-       ))) {
+       p = NULL;
+       while ((p = procps_scan(p, psscan_flags)) != NULL) {
+               int len;
 #if ENABLE_SELINUX
-               if (use_selinux) {
-                       len = printf("%5u %-32s %s ",
+               if (psscan_flags & PSSCAN_CONTEXT) {
+                       len = printf("%5u %-32.32s %s  ",
                                        p->pid,
                                        p->context ? p->context : "unknown",
                                        p->state);
                } else
 #endif
                {
-                       const char *user = get_cached_username(p->uid);
-                       if (p->vsz == 0)
-                               len = printf("%5u %-8s        %s ",
-                                       p->pid, user, p->state);
-                       else
-                               len = printf("%5u %-8s %6lu %s ",
-                                       p->pid, user, p->vsz, p->state);
+                       char buf6[6];
+                       smart_ulltoa5(p->vsz, buf6, " mgtpezy")[0] = '\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 = uptime - (p->start_time / 100);
+                               time_t start = now - elapsed;
+                               struct tm *tm = localtime(&start);
+
+                               smart_ulltoa5(p->rss, bufr, " mgtpezy")[0] = '\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
+                       {
+                               const char *user = get_cached_username(p->uid);
+                               len = printf("%5u %-8.8s %s %s  ",
+                                       p->pid, user, buf6, p->state);
+                       }
                }
 
                {
@@ -421,4 +796,4 @@ int ps_main(int argc, char **argv)
        return EXIT_SUCCESS;
 }
 
-#endif /* ENABLE_DESKTOP */
+#endif /* !ENABLE_DESKTOP */