20 files changed, 130 insertions, 103 deletions

diff --git a/procps/Config.src b/procps/Config.src
index 35fef2eda..515d79938 100644
--- a/procps/Config.src
+++ b/procps/Config.src
@@ -12,7 +12,7 @@ config FEATURE_SHOW_THREADS
         default y
         depends on PS || TOP || PSTREE
         help
-          Enables the ps -T option, showing of threads in pstree,
-          and 'h' command in top.
+        Enables the ps -T option, showing of threads in pstree,
+        and 'h' command in top.
 
 endmenu
diff --git a/procps/free.c b/procps/free.c
index f3a2c3c0c..618664e08 100644
--- a/procps/free.c
+++ b/procps/free.c
@@ -7,13 +7,13 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 //config:config FREE
-//config:       bool "free"
+//config:       bool "free (2.4 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX #sysinfo()
 //config:       help
-//config:         free displays the total amount of free and used physical and swap
-//config:         memory in the system, as well as the buffers used by the kernel.
-//config:         The shared memory column should be ignored; it is obsolete.
+//config:       free displays the total amount of free and used physical and swap
+//config:       memory in the system, as well as the buffers used by the kernel.
+//config:       The shared memory column should be ignored; it is obsolete.
 
 //applet:IF_FREE(APPLET(free, BB_DIR_USR_BIN, BB_SUID_DROP))
 
diff --git a/procps/fuser.c b/procps/fuser.c
index db28cca79..2585a4203 100644
--- a/procps/fuser.c
+++ b/procps/fuser.c
@@ -7,12 +7,12 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 //config:config FUSER
-//config:       bool "fuser"
+//config:       bool "fuser (7 kb)"
 //config:       default y
 //config:       help
-//config:         fuser lists all PIDs (Process IDs) that currently have a given
-//config:         file open. fuser can also list all PIDs that have a given network
-//config:         (TCP or UDP) port open.
+//config:       fuser lists all PIDs (Process IDs) that currently have a given
+//config:       file open. fuser can also list all PIDs that have a given network
+//config:       (TCP or UDP) port open.
 
 //applet:IF_FUSER(APPLET(fuser, BB_DIR_USR_BIN, BB_SUID_DROP))
 
diff --git a/procps/iostat.c b/procps/iostat.c
index 2db343f69..6a39c324f 100644
--- a/procps/iostat.c
+++ b/procps/iostat.c
@@ -8,10 +8,10 @@
  */
 
 //config:config IOSTAT
-//config:       bool "iostat"
+//config:       bool "iostat (7.4 kb)"
 //config:       default y
 //config:       help
-//config:         Report CPU and I/O statistics
+//config:       Report CPU and I/O statistics
 
 //applet:IF_IOSTAT(APPLET(iostat, BB_DIR_BIN, BB_SUID_DROP))
 
diff --git a/procps/kill.c b/procps/kill.c
index 975a3e8c5..5cff24475 100644
--- a/procps/kill.c
+++ b/procps/kill.c
@@ -8,29 +8,29 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config KILL
-//config:       bool "kill"
+//config:       bool "kill (2.6 kb)"
 //config:       default y
 //config:       help
-//config:         The command kill sends the specified signal to the specified
-//config:         process or process group. If no signal is specified, the TERM
-//config:         signal is sent.
+//config:       The command kill sends the specified signal to the specified
+//config:       process or process group. If no signal is specified, the TERM
+//config:       signal is sent.
 //config:
 //config:config KILLALL
-//config:       bool "killall"
+//config:       bool "killall (5.6 kb)"
 //config:       default y
 //config:       help
-//config:         killall sends a signal to all processes running any of the
-//config:         specified commands. If no signal name is specified, SIGTERM is
-//config:         sent.
+//config:       killall sends a signal to all processes running any of the
+//config:       specified commands. If no signal name is specified, SIGTERM is
+//config:       sent.
 //config:
 //config:config KILLALL5
-//config:       bool "killall5"
+//config:       bool "killall5 (5.3 kb)"
 //config:       default y
 //config:       help
-//config:         The SystemV killall command. killall5 sends a signal
-//config:         to all processes except kernel threads and the processes
-//config:         in its own session, so it won't kill the shell that is running
-//config:         the script it was called from.
+//config:       The SystemV killall command. killall5 sends a signal
+//config:       to all processes except kernel threads and the processes
+//config:       in its own session, so it won't kill the shell that is running
+//config:       the script it was called from.
 
 //applet:IF_KILL(APPLET(kill, BB_DIR_BIN, BB_SUID_DROP))
 //                   APPLET_ODDNAME:name      main  location         suid_type     help
diff --git a/procps/lsof.c b/procps/lsof.c
index b0156a538..8d3a23cc8 100644
--- a/procps/lsof.c
+++ b/procps/lsof.c
@@ -8,11 +8,11 @@
  */
 
 //config:config LSOF
-//config:       bool "lsof"
+//config:       bool "lsof (3.6 kb)"
 //config:       default y
 //config:       help
-//config:         Show open files in the format of:
-//config:         PID <TAB> /path/to/executable <TAB> /path/to/opened/file
+//config:       Show open files in the format of:
+//config:       PID <TAB> /path/to/executable <TAB> /path/to/opened/file
 
 //applet:IF_LSOF(APPLET(lsof, BB_DIR_USR_BIN, BB_SUID_DROP))
 
diff --git a/procps/mpstat.c b/procps/mpstat.c
index 8a79fd8ba..05a3f3ff3 100644
--- a/procps/mpstat.c
+++ b/procps/mpstat.c
@@ -12,10 +12,10 @@
 //kbuild:lib-$(CONFIG_MPSTAT) += mpstat.o
 
 //config:config MPSTAT
-//config:       bool "mpstat"
+//config:       bool "mpstat (10 kb)"
 //config:       default y
 //config:       help
-//config:         Per-processor statistics
+//config:       Per-processor statistics
 
 #include "libbb.h"
 #include <sys/utsname.h>  /* struct utsname */
diff --git a/procps/nmeter.c b/procps/nmeter.c
index 05bf0a08c..9463f94dc 100644
--- a/procps/nmeter.c
+++ b/procps/nmeter.c
@@ -7,10 +7,10 @@
  */
 
 //config:config NMETER
-//config:       bool "nmeter"
+//config:       bool "nmeter (10 kb)"
 //config:       default y
 //config:       help
-//config:         Prints selected system stats continuously, one line per update.
+//config:       Prints selected system stats continuously, one line per update.
 
 //applet:IF_NMETER(APPLET(nmeter, BB_DIR_USR_BIN, BB_SUID_DROP))
 
diff --git a/procps/pgrep.c b/procps/pgrep.c
index 3d01c6cff..a3ca9e295 100644
--- a/procps/pgrep.c
+++ b/procps/pgrep.c
@@ -7,16 +7,16 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config PGREP
-//config:       bool "pgrep"
+//config:       bool "pgrep (6.8 kb)"
 //config:       default y
 //config:       help
-//config:         Look for processes by name.
+//config:       Look for processes by name.
 //config:
 //config:config PKILL
-//config:       bool "pkill"
+//config:       bool "pkill (7.6 kb)"
 //config:       default y
 //config:       help
-//config:         Send signals to processes by name.
+//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
@@ -155,15 +155,18 @@ int pgrep_main(int argc UNUSED_PARAM, char **argv)
         proc = NULL;
         while ((proc = procps_scan(proc, scan_mask)) != NULL) {
                 char *cmd;
-                int cmdlen;
+                int cmdlen, match;
 
                 if (proc->pid == pid)
                         continue;
 
-                if (ppid2match >= 0 && ppid2match != proc->ppid)
-                        continue;
-                if (sid2match >= 0 && sid2match != proc->sid)
-                        continue;
+                if (!OPT_INVERT) {
+                        /* Quickly reject -sN -PN mismatches... unless -v */
+                        if (ppid2match >= 0 && ppid2match != proc->ppid)
+                                continue;
+                        if (sid2match >= 0 && sid2match != proc->sid)
+                                continue;
+                }
 
                 cmdlen = -1;
                 cmd = proc->argv0;
@@ -186,12 +189,36 @@ int pgrep_main(int argc UNUSED_PARAM, char **argv)
                         }
                 }
 
+                if (OPT_INVERT) {
+                        /* "pgrep -v -P1 firefox" means "not (ppid=1 AND name=firefox)"
+                         * or equivalently "ppid!=1 OR name!=firefox".
+                         * Check the first condition and if true, skip matching.
+                         */
+                        if (ppid2match >= 0 && ppid2match != proc->ppid)
+                                goto got_it;
+                        if (sid2match >= 0 && sid2match != proc->sid)
+                                goto got_it;
+                }
+
+                match = !argv[0]; /* if no PATTERN, then it's a match, else... */
+                if (!match) {
+ again:
+                        match = (regexec(&re_buffer, cmd, 1, re_match, 0) == 0);
+                        if (!match && cmd != proc->comm) {
+                                /* if argv[] did not match, try comm */
+                                cmdlen = -1;
+                                cmd = proc->comm;
+                                goto again;
+                        }
+                        if (match && OPT_ANCHOR) {
+                                /* -x requires full string match */
+                                match = (re_match[0].rm_so == 0 && cmd[re_match[0].rm_eo] == '\0');
+                        }
+                }
+
                 /* NB: OPT_INVERT is always 0 or 1 */
-                if (!argv[0]
-                 || (regexec(&re_buffer, cmd, 1, re_match, 0) == 0 /* match found */
-                    && (!OPT_ANCHOR || (re_match[0].rm_so == 0 && re_match[0].rm_eo == (regoff_t)strlen(cmd)))
-                    ) ^ OPT_INVERT
-                ) {
+                if (match ^ OPT_INVERT) {
+ got_it:
                         matched_pid = proc->pid;
                         if (OPT_LAST) {
                                 free(cmd_last);
diff --git a/procps/pidof.c b/procps/pidof.c
index b64f0cbd6..41247a02c 100644
--- a/procps/pidof.c
+++ b/procps/pidof.c
@@ -7,27 +7,27 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 //config:config PIDOF
-//config:       bool "pidof"
+//config:       bool "pidof (6.6 kb)"
 //config:       default y
 //config:       help
-//config:         Pidof finds the process id's (pids) of the named programs. It prints
-//config:         those id's on the standard output.
+//config:       Pidof finds the process id's (pids) of the named programs. It prints
+//config:       those id's on the standard output.
 //config:
 //config:config FEATURE_PIDOF_SINGLE
 //config:       bool "Enable single shot (-s)"
 //config:       default y
 //config:       depends on PIDOF
 //config:       help
-//config:         Support '-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 omitting pids (-o PID)"
 //config:       default y
 //config:       depends on PIDOF
 //config:       help
-//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.
+//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.
 
 //applet:IF_PIDOF(APPLET(pidof, BB_DIR_BIN, BB_SUID_DROP))
 
diff --git a/procps/pmap.c b/procps/pmap.c
index aa221cfb8..c8f728897 100644
--- a/procps/pmap.c
+++ b/procps/pmap.c
@@ -9,10 +9,10 @@
  */
 
 //config:config PMAP
-//config:       bool "pmap"
-//config:       default y
-//config:       help
-//config:         Display processes' memory mappings.
+//config:       bool "pmap (6 kb)"
+//config:       default y
+//config:       help
+//config:       Display processes' memory mappings.
 
 //applet:IF_PMAP(APPLET(pmap, BB_DIR_USR_BIN, BB_SUID_DROP))
 //kbuild:lib-$(CONFIG_PMAP) += pmap.o
diff --git a/procps/powertop.c b/procps/powertop.c
index 413806836..ebd659bdb 100644
--- a/procps/powertop.c
+++ b/procps/powertop.c
@@ -14,18 +14,18 @@
 //kbuild:lib-$(CONFIG_POWERTOP) += powertop.o
 
 //config:config POWERTOP
-//config:       bool "powertop"
+//config:       bool "powertop (9.1 kb)"
 //config:       default y
 //config:       help
-//config:         Analyze power consumption on Intel-based laptops
+//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.
+//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
diff --git a/procps/ps.c b/procps/ps.c
index f7242f2d5..c1da921bd 100644
--- a/procps/ps.c
+++ b/procps/ps.c
@@ -9,27 +9,27 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 //config:config PS
-//config:       bool "ps"
+//config:       bool "ps (11 kb)"
 //config:       default y
 //config:       help
-//config:         ps gives a snapshot of the current processes.
+//config:       ps gives a snapshot of the current processes.
 //config:
 //config:config FEATURE_PS_WIDE
 //config:       bool "Enable wide output option (-w)"
 //config:       default y
 //config:       depends on PS && !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:       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:       default y
 //config:       depends on PS && !DESKTOP
 //config:       help
-//config:         Support argument 'l' for long output.
-//config:         Adds fields PPID, RSS, START, TIME & TTY
+//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"
@@ -42,8 +42,8 @@
 //config:       default n
 //config:       depends on FEATURE_PS_TIME
 //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:       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"
diff --git a/procps/pstree.c b/procps/pstree.c
index bc9f0c927..212cda23c 100644
--- a/procps/pstree.c
+++ b/procps/pstree.c
@@ -11,10 +11,10 @@
  */
 
 //config:config PSTREE
-//config:       bool "pstree"
+//config:       bool "pstree (9.4 kb)"
 //config:       default y
 //config:       help
-//config:         Display a tree of processes.
+//config:       Display a tree of processes.
 
 //applet:IF_PSTREE(APPLET(pstree, BB_DIR_USR_BIN, BB_SUID_DROP))
 
diff --git a/procps/pwdx.c b/procps/pwdx.c
index 4e34149ed..dac238950 100644
--- a/procps/pwdx.c
+++ b/procps/pwdx.c
@@ -9,10 +9,10 @@
  */
 
 //config:config PWDX
-//config:       bool "pwdx"
+//config:       bool "pwdx (3.5 kb)"
 //config:       default y
 //config:       help
-//config:         Report current working directory of a process
+//config:       Report current working directory of a process
 
 //applet:IF_PWDX(APPLET(pwdx, BB_DIR_USR_BIN, BB_SUID_DROP))
 
diff --git a/procps/smemcap.c b/procps/smemcap.c
index b2b32198f..17aeccd53 100644
--- a/procps/smemcap.c
+++ b/procps/smemcap.c
@@ -13,11 +13,11 @@
 //kbuild:lib-$(CONFIG_SMEMCAP) += smemcap.o
 
 //config:config SMEMCAP
-//config:       bool "smemcap"
+//config:       bool "smemcap (2.5 kb)"
 //config:       default y
 //config:       help
-//config:         smemcap is a tool for capturing process data for smem,
-//config:         a memory usage statistic tool.
+//config:       smemcap is a tool for capturing process data for smem,
+//config:       a memory usage statistic tool.
 
 #include "libbb.h"
 #define BB_ARCHIVE_PUBLIC
diff --git a/procps/sysctl.c b/procps/sysctl.c
index 93d7c3418..b17f5e896 100644
--- a/procps/sysctl.c
+++ b/procps/sysctl.c
@@ -11,10 +11,10 @@
  * v1.01.1 - busybox applet aware by <solar@gentoo.org>
  */
 //config:config BB_SYSCTL
-//config:       bool "sysctl"
+//config:       bool "sysctl (6.9 kb)"
 //config:       default y
 //config:       help
-//config:         Configure kernel parameters at runtime.
+//config:       Configure kernel parameters at runtime.
 
 //applet:IF_BB_SYSCTL(APPLET(sysctl, BB_DIR_SBIN, BB_SUID_DROP))
 
diff --git a/procps/top.c b/procps/top.c
index ff2fddeea..015d1ab74 100644
--- a/procps/top.c
+++ b/procps/top.c
@@ -50,66 +50,66 @@
  * chroot . ./top -bn1 >top1.out
  */
 //config:config TOP
-//config:       bool "top"
+//config:       bool "top (17 kb)"
 //config:       default y
 //config:       help
-//config:         The top program provides a dynamic real-time view of a running
-//config:         system.
+//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:       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
 //config:       depends on TOP
 //config:       help
-//config:         Make top display CPU usage for each process.
-//config:         This adds about 2k.
+//config:       Make top display CPU usage for each process.
+//config:       This adds about 2k.
 //config:
 //config:config FEATURE_TOP_CPU_GLOBAL_PERCENTS
 //config:       bool "Show CPU global usage percentage"
 //config:       default y
 //config:       depends on FEATURE_TOP_CPU_USAGE_PERCENTAGE
 //config:       help
-//config:         Makes top display "CPU: NN% usr NN% sys..." line.
-//config:         This adds about 0.5k.
+//config:       Makes top display "CPU: NN% usr NN% sys..." line.
+//config:       This adds about 0.5k.
 //config:
 //config:config FEATURE_TOP_SMP_CPU
 //config:       bool "SMP CPU usage display ('c' key)"
 //config:       default y
 //config:       depends on FEATURE_TOP_CPU_GLOBAL_PERCENTS
 //config:       help
-//config:         Allow 'c' key to switch between individual/cumulative CPU stats
-//config:         This adds about 0.5k.
+//config:       Allow 'c' key to switch between individual/cumulative CPU stats
+//config:       This adds about 0.5k.
 //config:
 //config:config FEATURE_TOP_DECIMALS
 //config:       bool "Show 1/10th of a percent in CPU/mem statistics"
 //config:       default y
 //config:       depends on FEATURE_TOP_CPU_USAGE_PERCENTAGE
 //config:       help
-//config:         Show 1/10th of a percent in CPU/mem statistics.
-//config:         This adds about 0.3k.
+//config:       Show 1/10th of a percent in CPU/mem statistics.
+//config:       This adds about 0.3k.
 //config:
 //config:config FEATURE_TOP_SMP_PROCESS
 //config:       bool "Show CPU process runs on ('j' field)"
 //config:       default y
 //config:       depends on TOP
 //config:       help
-//config:         Show CPU where process was last found running on.
-//config:         This is the 'j' field.
+//config:       Show CPU where process was last found running on.
+//config:       This is the 'j' field.
 //config:
 //config:config FEATURE_TOPMEM
 //config:       bool "Topmem command ('s' key)"
 //config:       default y
 //config:       depends on TOP
 //config:       help
-//config:         Enable 's' in top (gives lots of memory info).
+//config:       Enable 's' in top (gives lots of memory info).
 
 //applet:IF_TOP(APPLET(top, BB_DIR_USR_BIN, BB_SUID_DROP))
 
diff --git a/procps/uptime.c b/procps/uptime.c
index 8e8956c0f..24b2b39df 100644
--- a/procps/uptime.c
+++ b/procps/uptime.c
@@ -12,20 +12,20 @@
  * Added FEATURE_UPTIME_UTMP_SUPPORT flag.
  */
 //config:config UPTIME
-//config:       bool "uptime"
+//config:       bool "uptime (632 bytes)"
 //config:       default y
 //config:       select PLATFORM_LINUX #sysinfo()
 //config:       help
-//config:         uptime gives a one line display of the current time, how long
-//config:         the system has been running, how many users are currently logged
-//config:         on, and the system load averages for the past 1, 5, and 15 minutes.
+//config:       uptime gives a one line display of the current time, how long
+//config:       the system has been running, how many users are currently logged
+//config:       on, and the system load averages for the past 1, 5, and 15 minutes.
 //config:
 //config:config FEATURE_UPTIME_UTMP_SUPPORT
 //config:       bool "Show the number of users"
 //config:       default y
 //config:       depends on UPTIME && FEATURE_UTMP
 //config:       help
-//config:         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))
 
diff --git a/procps/watch.c b/procps/watch.c
index bb34124c0..2bb7cca90 100644
--- a/procps/watch.c
+++ b/procps/watch.c
@@ -12,11 +12,11 @@
 /* BB_AUDIT GNU defects -- only option -n is supported. */
 
 //config:config WATCH
-//config:       bool "watch"
+//config:       bool "watch (4.1 kb)"
 //config:       default y
 //config:       help
-//config:         watch is used to execute a program periodically, showing
-//config:         output to the screen.
+//config:       watch is used to execute a program periodically, showing
+//config:       output to the screen.
 
 //applet:IF_WATCH(APPLET(watch, BB_DIR_BIN, BB_SUID_DROP))