pkill: remove -v match inversion option

The option -v does not make much sense in pkill context.

Reported-By: "Jason A. Spiro" <jasonspiro4@gmail.com>
Bug-Debian: http://bugs.debian.org/558044
Signed-off-by: Sami Kerola <kerolasa@iki.fi>

diff --git a/pgrep.1 b/pgrep.1
index a7bb60fc631e0b28d54ffa9fbff11975bd139f01..8f7cd8eac2ee0481106ce99c5dabf4727819fb6b 100644 (file)
--- a/pgrep.1
+++ b/pgrep.1
@@ -110,7 +110,7 @@ Only match processes whose real user ID is listed.  Either the numerical or
 symbolical value may be used.
 .TP
 \fB\-v\fR, \fB\-\-inverse\fR\fR
-Negates the matching.
+Negates the matching.  (\fBpgrep\fP only.)
 .TP
 \fB\-x\fR, \fB\-\-exact\fR\fR
 Only match processes whose name (or command line if \-f is specified)

diff --git a/pgrep.c b/pgrep.c
index 47e3b4993a3df07b504b4979849c0e414771542d..6c6d2618598a4ccf97ca32af4a043dab4e4e5aa7 100644 (file)
--- a/pgrep.c
+++ b/pgrep.c
@@ -87,7 +87,8 @@ static int __attribute__ ((__noreturn__)) usage(int opt)
        if (i_am_pkill == 0) {
                fputs(_(" -c, --count               count of matching processes\n"
                        " -d, --delimeter <string>  specify output delimeter\n"
-                       " -l, --list-name           list PID and process name\n"), fp);
+                       " -l, --list-name           list PID and process name\n"
+                       " -v, --inverse             negates the matching\n"), fp);
        }
        if (i_am_pkill == 1) {
                fputs(_(" -<sig>, --signal <sig>    signal to send (either number or name)\n"
@@ -103,7 +104,6 @@ static int __attribute__ ((__noreturn__)) usage(int opt)
                " -t, --terminal <tty,...>  match by controlling terminal\n"
                " -u, --euid <id,...>       match by effective IDs\n"
                " -U, --uid <id,...>        match by real IDs\n"
-               " -v, --inverse             negates the matching\n"
                " -x, --exact               match exectly with command name\n"
                " -F, --pidfile <file>      read PIDs from file\n"
                " -L, --logpidfile          fail if PID file is not locked\n"), fp);
@@ -616,10 +616,10 @@ static void parse_opts (int argc, char **argv)
                strcat (opts, "e");
        } else {
                /* These options are for pgrep only */
-               strcat (opts, "cld:");
+               strcat (opts, "cld:v");
        }
                        
-       strcat (opts, "LF:fnovxP:g:s:u:U:G:t:?Vh");
+       strcat (opts, "LF:fnoxP:g:s:u:U:G:t:?Vh");
        
        while ((opt = getopt_long (argc, argv, opts, longopts, NULL)) != -1) {
                switch (opt) {