11 files changed, 30 insertions, 27 deletions

diff --git a/procps/iostat.c b/procps/iostat.c
index 050625f57..09aae7102 100644
--- a/procps/iostat.c
+++ b/procps/iostat.c
@@ -6,7 +6,6 @@
  *
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
-
 //config:config IOSTAT
 //config:       bool "iostat (7.4 kb)"
 //config:       default y
diff --git a/procps/kill.c b/procps/kill.c
index 0ddae2f70..24cc903fc 100644
--- a/procps/kill.c
+++ b/procps/kill.c
@@ -184,6 +184,10 @@ int kill_main(int argc UNUSED_PARAM, char **argv)
         if (is_killall5 && arg[0] == 'o')
                 goto do_it_now;
 
+        /* "--" separates options from args. Testcase: "kill -- -123" */
+        if (!is_killall5 && arg[0] == '-' && arg[1] == '\0')
+                goto do_it_sooner;
+
         if (argv[1] && arg[0] == 's' && arg[1] == '\0') { /* -s SIG? */
                 arg = *++argv;
         } /* else it must be -SIG */
@@ -192,6 +196,7 @@ int kill_main(int argc UNUSED_PARAM, char **argv)
                 bb_error_msg("bad signal name '%s'", arg);
                 return EXIT_FAILURE;
         }
+ do_it_sooner:
         arg = *++argv;
 
  do_it_now:
diff --git a/procps/lsof.c b/procps/lsof.c
index 8d3a23cc8..4917cf899 100644
--- a/procps/lsof.c
+++ b/procps/lsof.c
@@ -6,7 +6,6 @@
  *
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
-
 //config:config LSOF
 //config:       bool "lsof (3.6 kb)"
 //config:       default y
diff --git a/procps/mpstat.c b/procps/mpstat.c
index c6279f9d8..b1ac09d75 100644
--- a/procps/mpstat.c
+++ b/procps/mpstat.c
@@ -6,18 +6,17 @@
  *
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
-
-//applet:IF_MPSTAT(APPLET(mpstat, BB_DIR_BIN, BB_SUID_DROP))
-/* shouldn't be noexec: "mpstat INTERVAL" runs indefinitely */
-
-//kbuild:lib-$(CONFIG_MPSTAT) += mpstat.o
-
 //config:config MPSTAT
 //config:       bool "mpstat (10 kb)"
 //config:       default y
 //config:       help
 //config:       Per-processor statistics
 
+//applet:IF_MPSTAT(APPLET(mpstat, BB_DIR_BIN, BB_SUID_DROP))
+/* shouldn't be noexec: "mpstat INTERVAL" runs indefinitely */
+
+//kbuild:lib-$(CONFIG_MPSTAT) += mpstat.o
+
 #include "libbb.h"
 #include <sys/utsname.h>  /* struct utsname */
 
diff --git a/procps/nmeter.c b/procps/nmeter.c
index 9463f94dc..166c8ab18 100644
--- a/procps/nmeter.c
+++ b/procps/nmeter.c
@@ -5,7 +5,6 @@
  *
  * Contact me: vda.linux@googlemail.com
  */
-
 //config:config NMETER
 //config:       bool "nmeter (10 kb)"
 //config:       default y
diff --git a/procps/pmap.c b/procps/pmap.c
index 5c2d1ad59..c8fa0d280 100644
--- a/procps/pmap.c
+++ b/procps/pmap.c
@@ -7,7 +7,6 @@
  * Licensed under GPLv2 or later, see the LICENSE file in this source tree
  * for details.
  */
-
 //config:config PMAP
 //config:       bool "pmap (6 kb)"
 //config:       default y
@@ -15,6 +14,7 @@
 //config:       Display processes' memory mappings.
 
 //applet:IF_PMAP(APPLET(pmap, BB_DIR_USR_BIN, BB_SUID_DROP))
+
 //kbuild:lib-$(CONFIG_PMAP) += pmap.o
 
 //usage:#define pmap_trivial_usage
diff --git a/procps/powertop.c b/procps/powertop.c
index 5d522bf91..2872035cf 100644
--- a/procps/powertop.c
+++ b/procps/powertop.c
@@ -51,6 +51,8 @@
 /* Max filename length of entry in /sys/devices subsystem */
 #define BIG_SYSNAME_LEN    16
 
+#define ESC "\033"
+
 typedef unsigned long long ullong;
 
 struct line {
@@ -776,8 +778,8 @@ int powertop_main(int UNUSED_PARAM argc, char UNUSED_PARAM **argv)
                         }
                 }
 
-                /* Clear the screen */
-                printf("\033[H\033[J");
+                /* Home; clear screen */
+                printf(ESC"[H" ESC"[J");
 
                 /* Clear C-state lines */
                 memset(&cstate_lines, 0, sizeof(cstate_lines));
diff --git a/procps/pwdx.c b/procps/pwdx.c
index c72cf804a..6009e2aa3 100644
--- a/procps/pwdx.c
+++ b/procps/pwdx.c
@@ -7,7 +7,6 @@
  *
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
-
 //config:config PWDX
 //config:       bool "pwdx (3.5 kb)"
 //config:       default y
diff --git a/procps/smemcap.c b/procps/smemcap.c
index 17aeccd53..f2e2de29d 100644
--- a/procps/smemcap.c
+++ b/procps/smemcap.c
@@ -7,11 +7,6 @@
  the GNU General Public License version 2 or later, incorporated
  herein by reference.
 */
-
-//applet:IF_SMEMCAP(APPLET(smemcap, BB_DIR_USR_BIN, BB_SUID_DROP))
-
-//kbuild:lib-$(CONFIG_SMEMCAP) += smemcap.o
-
 //config:config SMEMCAP
 //config:       bool "smemcap (2.5 kb)"
 //config:       default y
@@ -19,6 +14,10 @@
 //config:       smemcap is a tool for capturing process data for smem,
 //config:       a memory usage statistic tool.
 
+//applet:IF_SMEMCAP(APPLET(smemcap, BB_DIR_USR_BIN, BB_SUID_DROP))
+
+//kbuild:lib-$(CONFIG_SMEMCAP) += smemcap.o
+
 #include "libbb.h"
 #define BB_ARCHIVE_PUBLIC
 #include "bb_archive.h"
diff --git a/procps/top.c b/procps/top.c
index f97ded5d6..b777c494e 100644
--- a/procps/top.c
+++ b/procps/top.c
@@ -117,6 +117,7 @@
 
 #include "libbb.h"
 
+#define ESC "\033"
 
 typedef struct top_status_t {
         unsigned long vsz;
@@ -580,7 +581,7 @@ static unsigned long display_header(int scr_width, int *lines_rem_p)
                 meminfo[MI_BUFFERS],
                 meminfo[MI_CACHED]);
         /* Go to top & clear to the end of screen */
-        printf(OPT_BATCH_MODE ? "%s\n" : "\033[H\033[J%s\n", scrbuf);
+        printf(OPT_BATCH_MODE ? "%s\n" : ESC"[H" ESC"[J" "%s\n", scrbuf);
         (*lines_rem_p)--;
 
         /* Display CPU time split as percentage of total time.
@@ -618,7 +619,7 @@ static NOINLINE void display_process_list(int lines_rem, int scr_width)
 #endif
 
         /* what info of the processes is shown */
-        printf(OPT_BATCH_MODE ? "%.*s" : "\033[7m%.*s\033[0m", scr_width,
+        printf(OPT_BATCH_MODE ? "%.*s" : ESC"[7m" "%.*s" ESC"[m", scr_width,
                 "  PID  PPID USER     STAT   VSZ %VSZ"
                 IF_FEATURE_TOP_SMP_PROCESS(" CPU")
                 IF_FEATURE_TOP_CPU_USAGE_PERCENTAGE(" %CPU")
@@ -802,7 +803,7 @@ static void display_topmem_header(int scr_width, int *lines_rem_p)
                 meminfo[MI_ANONPAGES],
                 meminfo[MI_MAPPED],
                 meminfo[MI_MEMFREE]);
-        printf(OPT_BATCH_MODE ? "%.*s\n" : "\033[H\033[J%.*s\n", scr_width, line_buf);
+        printf(OPT_BATCH_MODE ? "%.*s\n" : ESC"[H" ESC"[J" "%.*s\n", scr_width, line_buf);
 
         snprintf(line_buf, LINE_BUF_SIZE,
                 " slab:%lu buf:%lu cache:%lu dirty:%lu write:%lu",
@@ -844,7 +845,7 @@ static NOINLINE void display_topmem_process_list(int lines_rem, int scr_width)
         cp[6] = ch;
         do *cp++ = ch; while (*cp == ' ');
 
-        printf(OPT_BATCH_MODE ? "%.*s" : "\e[7m%.*s\e[0m", scr_width, line_buf);
+        printf(OPT_BATCH_MODE ? "%.*s" : ESC"[7m" "%.*s" ESC"[m", scr_width, line_buf);
         lines_rem--;
 
         if (lines_rem > ntop - G_scroll_ofs)
diff --git a/procps/watch.c b/procps/watch.c
index 6fc9f7db7..420e6d3d1 100644
--- a/procps/watch.c
+++ b/procps/watch.c
@@ -7,10 +7,6 @@
  *
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
-
-/* BB_AUDIT SUSv3 N/A */
-/* BB_AUDIT GNU defects -- only option -n is supported. */
-
 //config:config WATCH
 //config:       bool "watch (4.1 kb)"
 //config:       default y
@@ -35,8 +31,13 @@
 //usage:       "Mon Dec 17 10:31:42 GMT 2000\n"
 //usage:       "Mon Dec 17 10:31:44 GMT 2000"
 
+/* BB_AUDIT SUSv3 N/A */
+/* BB_AUDIT GNU defects -- only option -n is supported. */
+
 #include "libbb.h"
 
+#define ESC "\033"
+
 // procps 2.0.18:
 // watch [-d] [-n seconds]
 //   [--differences[=cumulative]] [--interval=seconds] command
@@ -77,7 +78,7 @@ int watch_main(int argc UNUSED_PARAM, char **argv)
         header = NULL;
         while (1) {
                 /* home; clear to the end of screen */
-                printf("\033[H""\033[J");
+                printf(ESC"[H" ESC"[J");
                 if (!(opt & 0x2)) { // no -t
                         const unsigned time_len = sizeof("1234-67-90 23:56:89");