3 files changed, 49 insertions, 25 deletions

diff --git a/procps/powertop.c b/procps/powertop.c
index 008cdfca4..b4c45edbc 100644
--- a/procps/powertop.c
+++ b/procps/powertop.c
@@ -9,7 +9,7 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 
-//applet:IF_POWERTOP(APPLET(powertop, BB_DIR_BIN, BB_SUID_DROP))
+//applet:IF_POWERTOP(APPLET(powertop, BB_DIR_USR_SBIN, BB_SUID_DROP))
 
 //kbuild:lib-$(CONFIG_POWERTOP) += powertop.o
 
diff --git a/procps/ps.c b/procps/ps.c
index aa004aa22..dc6fda61d 100644
--- a/procps/ps.c
+++ b/procps/ps.c
@@ -69,6 +69,31 @@
 /* Absolute maximum on output line length */
 enum { MAX_WIDTH = 2*1024 };
 
+#if ENABLE_FEATURE_PS_TIME || ENABLE_FEATURE_PS_LONG
+static long get_uptime(void)
+{
+#ifdef __linux__
+        struct sysinfo info;
+        if (sysinfo(&info) < 0)
+                return 0;
+        return info.uptime;
+#elif 1
+        char buf[64];
+        long uptime;
+        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, "%l", &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() */
@@ -197,8 +222,6 @@ static inline unsigned get_HZ_by_waiting(void)
 
 static unsigned get_kernel_HZ(void)
 {
-        //char buf[64];
-        struct sysinfo info;
 
         if (kernel_HZ)
                 return kernel_HZ;
@@ -208,12 +231,7 @@ static unsigned get_kernel_HZ(void)
         if (kernel_HZ == (unsigned)-1)
                 kernel_HZ = get_HZ_by_waiting();
 
-        //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, "%llu", &seconds_since_boot);
-        sysinfo(&info);
-        seconds_since_boot = info.uptime;
+        seconds_since_boot = get_uptime();
 
         return kernel_HZ;
 }
@@ -645,7 +663,7 @@ int ps_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
         };
 #if ENABLE_FEATURE_PS_LONG
         time_t now = now;
-        struct sysinfo info;
+        long uptime;
 #endif
         int opts = 0;
         /* If we support any options, parse argv */
@@ -705,7 +723,7 @@ int ps_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
                 puts("S   UID   PID  PPID   VSZ   RSS TTY   STIME TIME     CMD");
 #if ENABLE_FEATURE_PS_LONG
                 now = time(NULL);
-                sysinfo(&info);
+                uptime = get_uptime();
 #endif
         }
         else {
@@ -737,7 +755,7 @@ int ps_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
                                 char tty[2 * sizeof(int)*3 + 2];
                                 char *endp;
                                 unsigned sut = (p->stime + p->utime) / 100;
-                                unsigned elapsed = info.uptime - (p->start_time / 100);
+                                unsigned elapsed = uptime - (p->start_time / 100);
                                 time_t start = now - elapsed;
                                 struct tm *tm = localtime(&start);
 
diff --git a/procps/sysctl.c b/procps/sysctl.c
index 5296d0f58..878656862 100644
--- a/procps/sysctl.c
+++ b/procps/sysctl.c
@@ -12,21 +12,23 @@
  */
 
 //usage:#define sysctl_trivial_usage
-//usage:       "[OPTIONS] [VALUE]..."
+//usage:       "[OPTIONS] [KEY[=VALUE]]..."
 //usage:#define sysctl_full_usage "\n\n"
-//usage:       "Configure kernel parameters at runtime\n"
-//usage:     "\n        -n      Don't print key names"
+//usage:       "Show/set kernel parameters\n"
 //usage:     "\n        -e      Don't warn about unknown keys"
-//usage:     "\n        -w      Change sysctl setting"
-//usage:     "\n        -p FILE Load sysctl settings from FILE (default /etc/sysctl.conf)"
-//usage:     "\n        -a      Display all values"
-//usage:     "\n        -A      Display all values in table form"
+//usage:     "\n        -n      Don't show key names"
+//usage:     "\n        -a      Show all values"
+/* Same as -a, no need to show it */
+/* //usage:     "\n     -A      Show all values in table form" */
+//usage:     "\n        -w      Set values"
+//usage:     "\n        -p FILE Set values from FILE (default /etc/sysctl.conf)"
+//usage:     "\n        -q      Set values silently"
 //usage:
 //usage:#define sysctl_example_usage
 //usage:       "sysctl [-n] [-e] variable...\n"
-//usage:       "sysctl [-n] [-e] -w variable=value...\n"
+//usage:       "sysctl [-n] [-e] [-q] -w variable=value...\n"
 //usage:       "sysctl [-n] [-e] -a\n"
-//usage:       "sysctl [-n] [-e] -p file        (default /etc/sysctl.conf)\n"
+//usage:       "sysctl [-n] [-e] [-q] -p file   (default /etc/sysctl.conf)\n"
 //usage:       "sysctl [-n] [-e] -A\n"
 
 #include "libbb.h"
@@ -37,9 +39,11 @@ enum {
         FLAG_TABLE_FORMAT    = 1 << 2, /* not implemented */
         FLAG_SHOW_ALL        = 1 << 3,
         FLAG_PRELOAD_FILE    = 1 << 4,
+/* TODO: procps 3.2.8 seems to not require -w for KEY=VAL to work: */
         FLAG_WRITE           = 1 << 5,
+        FLAG_QUIET           = 1 << 6,
 };
-#define OPTION_STR "neAapw"
+#define OPTION_STR "neAapwq"
 
 static void sysctl_dots_to_slashes(char *name)
 {
@@ -144,9 +148,11 @@ static int sysctl_act_on_setting(char *setting)
 //TODO: procps 3.2.7 writes "value\n", note trailing "\n"
                 xwrite_str(fd, value);
                 close(fd);
-                if (option_mask32 & FLAG_SHOW_KEYS)
-                        printf("%s = ", outname);
-                puts(value);
+                if (!(option_mask32 & FLAG_QUIET)) {
+                        if (option_mask32 & FLAG_SHOW_KEYS)
+                                printf("%s = ", outname);
+                        puts(value);
+                }
         } else {
                 char c;