kill: remove pid command-name to option alias

Removal was promised to happen in March 2016 and the time has come to get
rid of this unexpected feature.

Reference: c5b057b3422504a671ee588fa66574ae876521f1
Reviewed-by: Benno Schulenberg <bensberg@justemail.net>
Signed-off-by: Sami Kerola <kerolasa@iki.fi>

diff --git a/Documentation/deprecated.txt b/Documentation/deprecated.txt
index 81a41220ffca71815239fefefded9f9758d02778..39dc335a06ec7f9e641bf41fac923de0b9bbd17e 100644 (file)
--- a/Documentation/deprecated.txt
+++ b/Documentation/deprecated.txt
@@ -34,11 +34,6 @@ why:   does not provide control on output data formatting. The recommended solut
 
 --------------------------
 
-what:  "pid" as binary name for "kill --pid"
-why:   too ugly, too obscure
-
---------------------------
-
 What:   mkfs
 Why:    use filesystem specific mkfs.<type>.
 

diff --git a/misc-utils/kill.1 b/misc-utils/kill.1
index f50d8509cd53e238aeb135b3a04c16624faea7de..a7d7a743fd5733a0cb5f0bf4113de112c850bdff 100644 (file)
--- a/misc-utils/kill.1
+++ b/misc-utils/kill.1
@@ -91,11 +91,6 @@ uid as the present process.
 \fB\-p\fR, \fB\-\-pid\fR
 Only print the process id (pid) of the named processes, do not send any
 signals.
-.IP
-The \fB\-\-pid\fR option is automatically enabled when the \fBkill\fR command
-is invoked with the name of
-.BR pid .
-This functionality is deprecated, and will be removed in March 2016.
 .TP
 \fB\-\-verbose\fR
 Print pid(s) that will be signaled with kill along with the signal.

diff --git a/misc-utils/kill.c b/misc-utils/kill.c
index 34b948797271f85059fca6de1be5431df32b4459..e52a03d4ba81c1ea8f1dc3b84104a5af40c5621e 100644 (file)
--- a/misc-utils/kill.c
+++ b/misc-utils/kill.c
@@ -472,10 +472,6 @@ int main(int argc, char **argv)
        textdomain(PACKAGE);
        atexit(close_stdout);
 
-       ctl.do_pid = (!strcmp(program_invocation_short_name, "pid"));   /* Yecch */
-       if (ctl.do_pid) /* FIXME: remove in March 2016.  */
-               warnx(_("use of 'kill --pid' option as command name is deprecated"));
-
        argv = parse_arguments(argc, argv, &ctl);
 
        /* The rest of the arguments should be process ids and names. */