11 files changed, 92 insertions, 76 deletions

diff --git a/procps/Config.src b/procps/Config.src
index eb4760752..35fef2eda 100644
--- a/procps/Config.src
+++ b/procps/Config.src
@@ -8,7 +8,7 @@ menu "Process Utilities"
 INSERT
 
 config FEATURE_SHOW_THREADS
-        bool "Support for showing threads in ps/pstree/top"
+        bool "Support thread display in ps/pstree/top"
         default y
         depends on PS || TOP || PSTREE
         help
diff --git a/procps/Kbuild.src b/procps/Kbuild.src
index e7adc7340..6b4fb7470 100644
--- a/procps/Kbuild.src
+++ b/procps/Kbuild.src
@@ -7,7 +7,3 @@
 lib-y:=
 
 INSERT
-
-lib-$(CONFIG_ASH) += kill.o  # used for built-in kill by ash
-lib-$(CONFIG_SH_IS_ASH) += kill.o  # used for built-in kill by ash
-lib-$(CONFIG_BASH_IS_ASH) += kill.o  # used for built-in kill by ash
diff --git a/procps/kill.c b/procps/kill.c
index 57a33bcaa..7ae5beead 100644
--- a/procps/kill.c
+++ b/procps/kill.c
@@ -33,7 +33,8 @@
 //config:         the script it was called from.
 
 //applet:IF_KILL(APPLET(kill, BB_DIR_BIN, BB_SUID_DROP))
-//applet:IF_KILLALL(APPLET_ODDNAME(killall, kill, BB_DIR_USR_BIN, BB_SUID_DROP, killall))
+//                   APPLET_ODDNAME:name      main  location         suid_type     help
+//applet:IF_KILLALL( APPLET_ODDNAME(killall,  kill, BB_DIR_USR_BIN,  BB_SUID_DROP, killall))
 //applet:IF_KILLALL5(APPLET_ODDNAME(killall5, kill, BB_DIR_USR_SBIN, BB_SUID_DROP, killall5))
 
 //kbuild:lib-$(CONFIG_KILL) += kill.o
@@ -92,28 +93,34 @@
  * This is needed to avoid collision with kill -9 ... syntax
  */
 
+//kbuild:lib-$(CONFIG_ASH_JOB_CONTROL) += kill.o
+//kbuild:lib-$(CONFIG_HUSH_KILL) += kill.o
+
+#define SH_KILL (ENABLE_ASH_JOB_CONTROL || ENABLE_HUSH_KILL)
+/* If shells want to have "kill", for ifdefs it's like ENABLE_KILL=1 */
+#if SH_KILL
+# undef  ENABLE_KILL
+# define ENABLE_KILL 1
+#endif
+#define KILL_APPLET_CNT (ENABLE_KILL + ENABLE_KILLALL + ENABLE_KILLALL5)
+
 int kill_main(int argc UNUSED_PARAM, char **argv)
 {
         char *arg;
         pid_t pid;
         int signo = SIGTERM, errors = 0, quiet = 0;
-#if ENABLE_KILL && !ENABLE_KILLALL && !ENABLE_KILLALL5
-# define killall  0
-# define killall5 0
-#elif !ENABLE_KILL && ENABLE_KILLALL && !ENABLE_KILLALL5
-# define killall  1
-# define killall5 0
-#elif !ENABLE_KILL && !ENABLE_KILLALL && ENABLE_KILLALL5
-# define killall  0
-# define killall5 1
+
+#if KILL_APPLET_CNT == 1
+# define is_killall  ENABLE_KILLALL
+# define is_killall5 ENABLE_KILLALL5
 #else
 /* How to determine who we are? find 3rd char from the end:
  * kill, killall, killall5
  *  ^i       ^a        ^l  - it's unique
  * (checking from the start is complicated by /bin/kill... case) */
         const char char3 = argv[0][strlen(argv[0]) - 3];
-# define killall  (ENABLE_KILLALL && char3 == 'a')
-# define killall5 (ENABLE_KILLALL5 && char3 == 'l')
+# define is_killall  (ENABLE_KILLALL  && char3 == 'a')
+# define is_killall5 (ENABLE_KILLALL5 && char3 == 'l')
 #endif
 
         /* Parse any options */
@@ -162,7 +169,7 @@ int kill_main(int argc UNUSED_PARAM, char **argv)
         }
 
         /* The -q quiet option */
-        if (killall && arg[1] == 'q' && arg[2] == '\0') {
+        if (is_killall && arg[1] == 'q' && arg[2] == '\0') {
                 quiet = 1;
                 arg = *++argv;
                 if (!arg)
@@ -174,7 +181,7 @@ int kill_main(int argc UNUSED_PARAM, char **argv)
         arg++; /* skip '-' */
 
         /* -o PID? (if present, it always is at the end of command line) */
-        if (killall5 && arg[0] == 'o')
+        if (is_killall5 && arg[0] == 'o')
                 goto do_it_now;
 
         if (argv[1] && arg[0] == 's' && arg[1] == '\0') { /* -s SIG? */
@@ -190,7 +197,7 @@ int kill_main(int argc UNUSED_PARAM, char **argv)
  do_it_now:
         pid = getpid();
 
-        if (killall5) {
+        if (is_killall5) {
                 pid_t sid;
                 procps_status_t* p = NULL;
                 /* compat: exitcode 2 is "no one was signaled" */
@@ -248,13 +255,14 @@ int kill_main(int argc UNUSED_PARAM, char **argv)
                 return ret;
         }
 
+#if ENABLE_KILL || ENABLE_KILLALL
         /* Pid or name is required for kill/killall */
         if (!arg) {
                 bb_error_msg("you need to specify whom to kill");
                 return EXIT_FAILURE;
         }
 
-        if (killall) {
+        if (!ENABLE_KILL || is_killall) {
                 /* Looks like they want to do a killall.  Do that */
                 do {
                         pid_t* pidList;
@@ -282,10 +290,12 @@ int kill_main(int argc UNUSED_PARAM, char **argv)
                 } while (arg);
                 return errors;
         }
+#endif
 
+#if ENABLE_KILL
         /* Looks like they want to do a kill. Do that */
         while (arg) {
-#if ENABLE_ASH || ENABLE_HUSH
+# if SH_KILL
                 /*
                  * We need to support shell's "hack formats" of
                  * " -PRGP_ID" (yes, with a leading space)
@@ -307,7 +317,7 @@ int kill_main(int argc UNUSED_PARAM, char **argv)
                         }
                         arg = end; /* can only point to ' ' or '\0' now */
                 }
-#else
+# else /* ENABLE_KILL but !SH_KILL */
                 pid = bb_strtoi(arg, NULL, 10);
                 if (errno) {
                         bb_error_msg("invalid number '%s'", arg);
@@ -316,8 +326,9 @@ int kill_main(int argc UNUSED_PARAM, char **argv)
                         bb_perror_msg("can't kill pid %d", (int)pid);
                         errors++;
                 }
-#endif
+# endif
                 arg = *++argv;
         }
         return errors;
+#endif
 }
diff --git a/procps/nmeter.c b/procps/nmeter.c
index 3eac2d3b2..05bf0a08c 100644
--- a/procps/nmeter.c
+++ b/procps/nmeter.c
@@ -24,7 +24,7 @@
 //usage:     "\n -d MSEC        Milliseconds between updates, default:1000, none:-1"
 //usage:     "\n"
 //usage:     "\nFormat specifiers:"
-//usage:     "\n %Nc or %[cN]   CPU. N - bar size (default:10)"
+//usage:     "\n %Nc or %[cN]   CPU. N - bar size (default 10)"
 //usage:     "\n                (displays: S:system U:user N:niced D:iowait I:irq i:softirq)"
 //usage:     "\n %[nINTERFACE]  Network INTERFACE"
 //usage:     "\n %m             Allocated memory"
diff --git a/procps/pgrep.c b/procps/pgrep.c
index ac82b5156..e932a32bc 100644
--- a/procps/pgrep.c
+++ b/procps/pgrep.c
@@ -19,6 +19,7 @@
 //config:         Send signals to processes by name.
 
 //applet:IF_PGREP(APPLET(pgrep, BB_DIR_USR_BIN, BB_SUID_DROP))
+//                APPLET_ODDNAME:name   main   location        suid_type     help
 //applet:IF_PKILL(APPLET_ODDNAME(pkill, pgrep, BB_DIR_USR_BIN, BB_SUID_DROP, pkill))
 
 //kbuild:lib-$(CONFIG_PGREP) += pgrep.o
diff --git a/procps/pidof.c b/procps/pidof.c
index 069adb7a4..b64f0cbd6 100644
--- a/procps/pidof.c
+++ b/procps/pidof.c
@@ -14,18 +14,18 @@
 //config:         those id's on the standard output.
 //config:
 //config:config FEATURE_PIDOF_SINGLE
-//config:       bool "Enable argument for single shot (-s)"
+//config:       bool "Enable single shot (-s)"
 //config:       default y
 //config:       depends on PIDOF
 //config:       help
-//config:         Support argument '-s' for returning only the first pid found.
+//config:         Support '-s' for returning only the first pid found.
 //config:
 //config:config FEATURE_PIDOF_OMIT
-//config:       bool "Enable argument for omitting pids (-o)"
+//config:       bool "Enable omitting pids (-o PID)"
 //config:       default y
 //config:       depends on PIDOF
 //config:       help
-//config:         Support argument '-o' for omitting the given pids in output.
+//config:         Support '-o PID' for omitting the given pid(s) in output.
 //config:         The special pid %PPID can be used to name the parent process
 //config:         of the pidof, in other words the calling shell or shell script.
 
diff --git a/procps/powertop.c b/procps/powertop.c
index ce85f4191..413806836 100644
--- a/procps/powertop.c
+++ b/procps/powertop.c
@@ -18,6 +18,14 @@
 //config:       default y
 //config:       help
 //config:         Analyze power consumption on Intel-based laptops
+//config:
+//config:config FEATURE_POWERTOP_INTERACTIVE
+//config:       bool "Accept keyboard commands"
+//config:       default y
+//config:       depends on POWERTOP
+//config:       help
+//config:         Without this, powertop will only refresh display every 10 seconds.
+//config:         No keyboard commands will work, only ^C to terminate.
 
 // XXX This should be configurable
 #define ENABLE_FEATURE_POWERTOP_PROCIRQ 1
@@ -82,7 +90,7 @@ struct globals {
         ullong last_usage[MAX_CSTATE_COUNT];
         ullong start_duration[MAX_CSTATE_COUNT];
         ullong last_duration[MAX_CSTATE_COUNT];
-#if ENABLE_FEATURE_USE_TERMIOS
+#if ENABLE_FEATURE_POWERTOP_INTERACTIVE
         struct termios init_settings;
 #endif
 };
@@ -91,7 +99,7 @@ struct globals {
         SET_PTR_TO_GLOBALS(xzalloc(sizeof(G))); \
 } while (0)
 
-#if ENABLE_FEATURE_USE_TERMIOS
+#if ENABLE_FEATURE_POWERTOP_INTERACTIVE
 static void reset_term(void)
 {
         tcsetattr_stdin_TCSANOW(&G.init_settings);
@@ -682,8 +690,7 @@ int powertop_main(int UNUSED_PARAM argc, char UNUSED_PARAM **argv)
         ullong cur_usage[MAX_CSTATE_COUNT];
         ullong cur_duration[MAX_CSTATE_COUNT];
         char cstate_lines[MAX_CSTATE_COUNT + 2][64];
-#if ENABLE_FEATURE_USE_TERMIOS
-        struct termios new_settings;
+#if ENABLE_FEATURE_POWERTOP_INTERACTIVE
         struct pollfd pfd[1];
 
         pfd[0].fd = 0;
@@ -706,15 +713,12 @@ int powertop_main(int UNUSED_PARAM argc, char UNUSED_PARAM **argv)
 
         puts("Collecting data for "DEFAULT_SLEEP_STR" seconds");
 
-#if ENABLE_FEATURE_USE_TERMIOS
-        tcgetattr(0, (void *)&G.init_settings);
-        memcpy(&new_settings, &G.init_settings, sizeof(new_settings));
-        /* Turn on unbuffered input, turn off echoing */
-        new_settings.c_lflag &= ~(ISIG | ICANON | ECHO | ECHONL);
+#if ENABLE_FEATURE_POWERTOP_INTERACTIVE
+        /* Turn on unbuffered input; turn off echoing, ^C ^Z etc */
+        set_termios_to_raw(STDIN_FILENO, &G.init_settings, TERMIOS_CLEAR_ISIG);
+        bb_signals(BB_FATAL_SIGS, sig_handler);
         /* So we don't forget to reset term settings */
         atexit(reset_term);
-        bb_signals(BB_FATAL_SIGS, sig_handler);
-        tcsetattr_stdin_TCSANOW(&new_settings);
 #endif
 
         /* Collect initial data */
@@ -739,7 +743,7 @@ int powertop_main(int UNUSED_PARAM argc, char UNUSED_PARAM **argv)
                 int i;
 
                 G.cant_enable_timer_stats |= start_timer(); /* 1 on error */
-#if !ENABLE_FEATURE_USE_TERMIOS
+#if !ENABLE_FEATURE_POWERTOP_INTERACTIVE
                 sleep(DEFAULT_SLEEP);
 #else
                 if (safe_poll(pfd, 1, DEFAULT_SLEEP * 1000) > 0) {
diff --git a/procps/ps.c b/procps/ps.c
index 902811f31..f7242f2d5 100644
--- a/procps/ps.c
+++ b/procps/ps.c
@@ -32,19 +32,10 @@
 //config:         Adds fields PPID, RSS, START, TIME & TTY
 //config:
 //config:config FEATURE_PS_TIME
-//config:       bool "Enable time and elapsed time output"
+//config:       bool "Support -o time and -o etime output specifiers"
 //config:       default y
 //config:       depends on PS && DESKTOP
 //config:       select PLATFORM_LINUX
-//config:       help
-//config:         Support -o time and -o etime output specifiers.
-//config:
-//config:config FEATURE_PS_ADDITIONAL_COLUMNS
-//config:       bool "Enable additional ps columns"
-//config:       default y
-//config:       depends on PS && DESKTOP
-//config:       help
-//config:         Support -o rgroup, -o ruser, -o nice output specifiers.
 //config:
 //config:config FEATURE_PS_UNUSUAL_SYSTEMS
 //config:       bool "Support Linux prior to 2.4.0 and non-ELF systems"
@@ -53,6 +44,11 @@
 //config:       help
 //config:         Include support for measuring HZ on old kernels and non-ELF systems
 //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:       default y
+//config:       depends on PS && DESKTOP
 
 //applet:IF_PS(APPLET(ps, BB_DIR_BIN, BB_SUID_DROP))
 
@@ -628,7 +624,9 @@ int ps_main(int argc UNUSED_PARAM, char **argv)
         procps_status_t *p;
         llist_t* opt_o = NULL;
         char default_o[sizeof(DEFAULT_O_STR)];
+#if ENABLE_SELINUX || ENABLE_FEATURE_SHOW_THREADS
         int opt;
+#endif
         enum {
                 OPT_Z = (1 << 0),
                 OPT_o = (1 << 1),
@@ -658,7 +656,11 @@ int ps_main(int argc UNUSED_PARAM, char **argv)
          * procps v3.2.7 supports -T and shows tids as SPID column,
          * it also supports -L where it shows tids as LWP column.
          */
-        opt = getopt32(argv, "Zo:*aAdefl"IF_FEATURE_SHOW_THREADS("T"), &opt_o);
+#if ENABLE_SELINUX || ENABLE_FEATURE_SHOW_THREADS
+        opt =
+#endif
+                getopt32(argv, "Zo:*aAdefl"IF_FEATURE_SHOW_THREADS("T"), &opt_o);
+
         if (opt_o) {
                 do {
                         parse_o(llist_pop(&opt_o));
diff --git a/procps/pstree.c b/procps/pstree.c
index c5fb83688..f97e99639 100644
--- a/procps/pstree.c
+++ b/procps/pstree.c
@@ -357,7 +357,9 @@ static void handle_thread(const char *comm, pid_t pid, pid_t ppid, uid_t uid)
 static void mread_proc(void)
 {
         procps_status_t *p = NULL;
+#if ENABLE_FEATURE_SHOW_THREADS
         pid_t parent = 0;
+#endif
         int flags = PSSCAN_COMM | PSSCAN_PID | PSSCAN_PPID | PSSCAN_UIDGID | PSSCAN_TASKS;
 
         while ((p = procps_scan(p, flags)) != NULL) {
@@ -368,7 +370,9 @@ static void mread_proc(void)
 #endif
                 {
                         add_proc(p->comm, p->pid, p->ppid, p->uid/*, 0*/);
+#if ENABLE_FEATURE_SHOW_THREADS
                         parent = p->pid;
+#endif
                 }
         }
 }
diff --git a/procps/top.c b/procps/top.c
index 71207bac1..ff2fddeea 100644
--- a/procps/top.c
+++ b/procps/top.c
@@ -56,6 +56,14 @@
 //config:         The top program provides a dynamic real-time view of a running
 //config:         system.
 //config:
+//config:config FEATURE_TOP_INTERACTIVE
+//config:       bool "Accept keyboard commands"
+//config:       default y
+//config:       depends on TOP
+//config:       help
+//config:         Without this, top will only refresh display every 5 seconds.
+//config:         No keyboard commands will work, only ^C to terminate.
+//config:
 //config:config FEATURE_TOP_CPU_USAGE_PERCENTAGE
 //config:       bool "Show CPU per-process usage percentage"
 //config:       default y
@@ -158,7 +166,7 @@ struct globals {
         smallint smp_cpu_info; /* one/many cpu info lines? */
 #endif
         unsigned lines;  /* screen height */
-#if ENABLE_FEATURE_USE_TERMIOS
+#if ENABLE_FEATURE_TOP_INTERACTIVE
         struct termios initial_settings;
         int scroll_ofs;
 #define G_scroll_ofs G.scroll_ofs
@@ -181,7 +189,7 @@ struct globals {
         jiffy_counts_t *cpu_jif, *cpu_prev_jif;
         int num_cpus;
 #endif
-#if ENABLE_FEATURE_USE_TERMIOS
+#if ENABLE_FEATURE_TOP_INTERACTIVE
         char kbd_input[KEYCODE_BUFFER_SIZE];
 #endif
         char line_buf[80];
@@ -220,7 +228,7 @@ enum {
 #define OPT_BATCH_MODE (option_mask32 & OPT_b)
 
 
-#if ENABLE_FEATURE_USE_TERMIOS
+#if ENABLE_FEATURE_TOP_INTERACTIVE
 static int pid_sort(top_status_t *P, top_status_t *Q)
 {
         /* Buggy wrt pids with high bit set */
@@ -725,8 +733,7 @@ static void clearmems(void)
         top = NULL;
 }
 
-#if ENABLE_FEATURE_USE_TERMIOS
-
+#if ENABLE_FEATURE_TOP_INTERACTIVE
 static void reset_term(void)
 {
         if (!OPT_BATCH_MODE)
@@ -738,8 +745,7 @@ static void sig_catcher(int sig)
         reset_term();
         kill_myself_with_sig(sig);
 }
-
-#endif /* FEATURE_USE_TERMIOS */
+#endif /* FEATURE_TOP_INTERACTIVE */
 
 /*
  * TOPMEM support
@@ -894,7 +900,7 @@ enum {
         EXIT_MASK = (unsigned)-1,
 };
 
-#if ENABLE_FEATURE_USE_TERMIOS
+#if ENABLE_FEATURE_TOP_INTERACTIVE
 static unsigned handle_input(unsigned scan_mask, unsigned interval)
 {
         if (option_mask32 & OPT_EOF) {
@@ -1043,7 +1049,7 @@ static unsigned handle_input(unsigned scan_mask, unsigned interval)
 //usage:   "\n""Read the status of all processes from /proc each SECONDS"
 //usage:   "\n""and display a screenful of them."
 //usage:   "\n"
-//usage:        IF_FEATURE_USE_TERMIOS(
+//usage:        IF_FEATURE_TOP_INTERACTIVE(
 //usage:       "Keys:"
 //usage:   "\n""        N/M"
 //usage:                IF_FEATURE_TOP_CPU_USAGE_PERCENTAGE("/P")
@@ -1091,9 +1097,6 @@ int top_main(int argc UNUSED_PARAM, char **argv)
         unsigned interval;
         char *str_interval, *str_iterations;
         unsigned scan_mask = TOP_MASK;
-#if ENABLE_FEATURE_USE_TERMIOS
-        struct termios new_settings;
-#endif
 
         INIT_G();
 
@@ -1141,13 +1144,10 @@ int top_main(int argc UNUSED_PARAM, char **argv)
         if (OPT_BATCH_MODE) {
                 option_mask32 |= OPT_EOF;
         }
-#if ENABLE_FEATURE_USE_TERMIOS
+#if ENABLE_FEATURE_TOP_INTERACTIVE
         else {
-                tcgetattr(0, (void *) &initial_settings);
-                memcpy(&new_settings, &initial_settings, sizeof(new_settings));
-                /* unbuffered input, turn off echo */
-                new_settings.c_lflag &= ~(ISIG | ICANON | ECHO | ECHONL);
-                tcsetattr_stdin_TCSANOW(&new_settings);
+                /* Turn on unbuffered input; turn off echoing, ^C ^Z etc */
+                set_termios_to_raw(STDIN_FILENO, &initial_settings, TERMIOS_CLEAR_ISIG);
         }
 
         bb_signals(BB_FATAL_SIGS, sig_catcher);
@@ -1165,14 +1165,12 @@ int top_main(int argc UNUSED_PARAM, char **argv)
                 } else {
                         G.lines = 24; /* default */
                         col = 79;
-#if ENABLE_FEATURE_USE_TERMIOS
                         /* We output to stdout, we need size of stdout (not stdin)! */
                         get_terminal_width_height(STDOUT_FILENO, &col, &G.lines);
                         if (G.lines < 5 || col < 10) {
                                 sleep(interval);
                                 continue;
                         }
-#endif
                         if (col > LINE_BUF_SIZE - 2)
                                 col = LINE_BUF_SIZE - 2;
                 }
@@ -1247,7 +1245,7 @@ int top_main(int argc UNUSED_PARAM, char **argv)
                 clearmems();
                 if (iterations >= 0 && !--iterations)
                         break;
-#if !ENABLE_FEATURE_USE_TERMIOS
+#if !ENABLE_FEATURE_TOP_INTERACTIVE
                 sleep(interval);
 #else
                 scan_mask = handle_input(scan_mask, interval);
@@ -1255,7 +1253,7 @@ int top_main(int argc UNUSED_PARAM, char **argv)
         } /* end of "while (not Q)" */
 
         bb_putchar('\n');
-#if ENABLE_FEATURE_USE_TERMIOS
+#if ENABLE_FEATURE_TOP_INTERACTIVE
         reset_term();
 #endif
         if (ENABLE_FEATURE_CLEAN_UP) {
diff --git a/procps/uptime.c b/procps/uptime.c
index 436193925..8e8956c0f 100644
--- a/procps/uptime.c
+++ b/procps/uptime.c
@@ -21,11 +21,11 @@
 //config:         on, and the system load averages for the past 1, 5, and 15 minutes.
 //config:
 //config:config FEATURE_UPTIME_UTMP_SUPPORT
-//config:       bool "Support for showing the number of users"
+//config:       bool "Show the number of users"
 //config:       default y
 //config:       depends on UPTIME && FEATURE_UTMP
 //config:       help
-//config:         Makes uptime display the number of users currently logged on.
+//config:         Display the number of users currently logged on.
 
 //applet:IF_UPTIME(APPLET(uptime, BB_DIR_USR_BIN, BB_SUID_DROP))