diff options
author | Sami Kerola | 2016-08-08 22:50:19 +0200 |
---|---|---|
committer | Sami Kerola | 2016-08-14 14:30:16 +0200 |
commit | 0be3ad70ad85cce75be6fffb87fa81e62bd4b105 (patch) | |
tree | d8c9708e5f39e1941cb8f56471e2d6bfea7686b6 | |
parent | misc: always check setenv(3) return value (diff) | |
download | kernel-qcow2-util-linux-0be3ad70ad85cce75be6fffb87fa81e62bd4b105.tar.gz kernel-qcow2-util-linux-0be3ad70ad85cce75be6fffb87fa81e62bd4b105.tar.xz kernel-qcow2-util-linux-0be3ad70ad85cce75be6fffb87fa81e62bd4b105.zip |
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>
-rw-r--r-- | Documentation/deprecated.txt | 5 | ||||
-rw-r--r-- | misc-utils/kill.1 | 5 | ||||
-rw-r--r-- | misc-utils/kill.c | 4 |
3 files changed, 0 insertions, 14 deletions
diff --git a/Documentation/deprecated.txt b/Documentation/deprecated.txt index 81a41220f..39dc335a0 100644 --- 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 f50d8509c..a7d7a743f 100644 --- 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 34b948797..e52a03d4b 100644 --- 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. */ |