1 files changed, 68 insertions, 117 deletions

diff --git a/procps/ps.c b/procps/ps.c
index 3e83a3e03..742d1715e 100644
--- a/procps/ps.c
+++ b/procps/ps.c
@@ -15,26 +15,26 @@
 //config:       ps gives a snapshot of the current processes.
 //config:
 //config:config FEATURE_PS_WIDE
-//config:       bool "Enable wide output option (-w)"
+//config:       bool "Enable wide output (-w)"
 //config:       default y
-//config:       depends on PS && !DESKTOP
+//config:       depends on (PS || MINIPS) && !DESKTOP
 //config:       help
 //config:       Support argument 'w' for wide output.
 //config:       If given once, 132 chars are printed, and if given more
 //config:       than once, the length is unlimited.
 //config:
 //config:config FEATURE_PS_LONG
-//config:       bool "Enable long output option (-l)"
+//config:       bool "Enable long output (-l)"
 //config:       default y
-//config:       depends on PS && !DESKTOP
+//config:       depends on (PS || MINIPS) && !DESKTOP
 //config:       help
 //config:       Support argument 'l' for long output.
 //config:       Adds fields PPID, RSS, START, TIME & TTY
 //config:
 //config:config FEATURE_PS_TIME
-//config:       bool "Support -o time and -o etime output specifiers"
+//config:       bool "Enable -o time and -o etime specifiers"
 //config:       default y
-//config:       depends on PS && DESKTOP
+//config:       depends on (PS || MINIPS) && DESKTOP
 //config:       select PLATFORM_LINUX
 //config:
 //config:config FEATURE_PS_UNUSUAL_SYSTEMS
@@ -46,13 +46,16 @@
 //config:       (if you are on Linux 2.4.0+ and use ELF, you don't need this)
 //config:
 //config:config FEATURE_PS_ADDITIONAL_COLUMNS
-//config:       bool "Support -o rgroup, -o ruser, -o nice specifiers"
+//config:       bool "Enable -o rgroup, -o ruser, -o nice specifiers"
 //config:       default y
-//config:       depends on PS && DESKTOP
+//config:       depends on (PS || MINIPS) && DESKTOP
 
-//applet:IF_PS(APPLET(ps, BB_DIR_BIN, BB_SUID_DROP))
+//                 APPLET_NOEXEC:name    main location    suid_type     help
+//applet:IF_PS(    APPLET_NOEXEC(ps,     ps,  BB_DIR_BIN, BB_SUID_DROP, ps))
+//applet:IF_MINIPS(APPLET_NOEXEC(minips, ps,  BB_DIR_BIN, BB_SUID_DROP, ps))
 
 //kbuild:lib-$(CONFIG_PS) += ps.o
+//kbuild:lib-$(CONFIG_MINIPS) += ps.o
 
 //usage:#if ENABLE_DESKTOP
 //usage:
@@ -144,12 +147,6 @@ static unsigned long get_uptime(void)
 #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
@@ -186,7 +183,9 @@ struct globals {
         char *buffer;
         unsigned terminal_width;
 #if ENABLE_FEATURE_PS_TIME
+# if ENABLE_FEATURE_PS_UNUSUAL_SYSTEMS || !defined(__linux__)
         unsigned kernel_HZ;
+# endif
         unsigned long seconds_since_boot;
 #endif
 } FIX_ALIASING;
@@ -197,91 +196,15 @@ struct globals {
 #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 { setup_common_bufsiz(); } 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;
-}
+# if ENABLE_FEATURE_PS_UNUSUAL_SYSTEMS || !defined(__linux__)
+#  define get_kernel_HZ() (G.kernel_HZ)
+# else
+    /* non-ancient Linux standardized on 100 for "times" freq */
+#  define get_kernel_HZ() ((unsigned)100)
+# endif
 #endif
 
 /* Print value to buf, max size+1 chars (including trailing '\0') */
@@ -379,52 +302,71 @@ static void func_tty(char *buf, int size, const procps_status_t *ps)
 #endif
 
 #if ENABLE_FEATURE_PS_ADDITIONAL_COLUMNS
-
 static void func_rgroup(char *buf, int size, const procps_status_t *ps)
 {
         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);
 }
-
 static void func_nice(char *buf, int size, const procps_status_t *ps)
 {
         sprintf(buf, "%*d", size, ps->niceness);
 }
-
 #endif
 
 #if ENABLE_FEATURE_PS_TIME
+static void format_time(char *buf, int size, unsigned long tt)
+{
+        unsigned ff;
 
+        /* Used to show "14453:50" if tt is large. Ugly.
+         * procps-ng 3.3.10 uses "[[dd-]hh:]mm:ss" format.
+         * TODO: switch to that?
+         */
+
+        /* Formatting for 5-char TIME column.
+         * NB: "size" is not always 5: ELAPSED is wider (7),
+         * not taking advantage of that (yet?).
+         */
+        ff = tt % 60;
+        tt /= 60;
+        if (tt < 60) {
+                snprintf(buf, size+1, "%2u:%02u", (unsigned)tt, ff);
+                return;
+        }
+        ff = tt % 60;
+        tt /= 60;
+        if (tt < 24) {
+                snprintf(buf, size+1, "%2uh%02u", (unsigned)tt, ff);
+                return;
+        }
+        ff = tt % 24;
+        tt /= 24;
+        if (tt < 100) {
+                snprintf(buf, size+1, "%2ud%02u", (unsigned)tt, ff);
+                return;
+        }
+        snprintf(buf, size+1, "%4lud", tt);
+}
 static void func_etime(char *buf, int size, const procps_status_t *ps)
 {
         /* 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);
+        format_time(buf, size, mm);
 }
-
 static void func_time(char *buf, int size, const procps_status_t *ps)
 {
         /* 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);
+        format_time(buf, size, mm);
 }
-
 #endif
 
 #if ENABLE_SELINUX
@@ -465,7 +407,7 @@ static const ps_out_t out_spec[] = {
 //      { 5                  , "pcpu"  ,"%CPU"   ,func_pcpu  ,PSSCAN_        },
 #endif
 #if ENABLE_FEATURE_PS_TIME
-        { 6                  , "time"  ,"TIME"   ,func_time  ,PSSCAN_STIME | PSSCAN_UTIME },
+        { 5                  , "time"  ,"TIME"   ,func_time  ,PSSCAN_STIME | PSSCAN_UTIME },
 #endif
 #if !ENABLE_PLATFORM_MINGW32
         { 6                  , "tty"   ,"TT"     ,func_tty   ,PSSCAN_TTY     },
@@ -641,6 +583,12 @@ int ps_main(int argc UNUSED_PARAM, char **argv)
         };
 
         INIT_G();
+#if ENABLE_FEATURE_PS_TIME
+        G.seconds_since_boot = get_uptime();
+# if ENABLE_FEATURE_PS_UNUSUAL_SYSTEMS || !defined(__linux__)
+        G.kernel_HZ = bb_clk_tck(); /* this is sysconf(_SC_CLK_TCK) */
+# endif
+#endif
 
         // POSIX:
         // -a  Write information for all processes associated with terminals
@@ -731,9 +679,12 @@ int ps_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
 # 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")IF_FEATURE_PS_LONG("l")
-                                        "w", &w_count);
+        make_all_argv_opts(argv);
+        opts = getopt32(argv, "^"
+                IF_SELINUX("Z")IF_FEATURE_SHOW_THREADS("T")IF_FEATURE_PS_LONG("l")"w"
+                "\0" "ww",
+                &w_count
+        );
         /* if w is given once, GNU ps sets the width to 132,
          * if w is given more than once, it is "unlimited"
          */
@@ -747,7 +698,7 @@ int ps_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
         }
 # else
         /* -w is not supported, only -Z and/or -T */
-        opt_complementary = "-";
+        make_all_argv_opts(argv);
         opts = getopt32(argv, IF_SELINUX("Z")IF_FEATURE_SHOW_THREADS("T")IF_FEATURE_PS_LONG("l"));
 # endif