From 03bef9178163351c72af7fc494a40411610bc227 Mon Sep 17 00:00:00 2001 From: =?utf8?q?P=C3=A1draig=20Brady?= Date: Sun, 13 Dec 2015 19:54:27 +0000 Subject: [PATCH] kill: add undocumented -L for compatibility procps, bash >= 4.4, and util-linux >= 2.23 all have the -L option to output a table. * src/kill.c (main): Have -L synonymous with -t. Luckily there is no signal that begins with 'L'. * tests/misc/kill.sh: Update the test. --- src/kill.c | 7 ++++--- tests/misc/kill.sh | 1 + 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/kill.c b/src/kill.c index 2913d99a61..1d0171bf02 100644 --- a/src/kill.c +++ b/src/kill.c @@ -53,9 +53,9 @@ static char const short_options[] = "0::1::2::3::4::5::6::7::8::9::" - "A::B::C::D::E::F::G::H::I::J::K::L::M::" + "A::B::C::D::E::F::G::H::I::J::K::M::" "N::O::P::Q::R::S::T::U::V::W::X::Y::Z::" - "ln:s:t"; + "Lln:s:t"; static struct option const long_options[] = { @@ -249,7 +249,7 @@ main (int argc, char **argv) /* Fall through. */ case 'A': case 'B': case 'C': case 'D': case 'E': case 'F': case 'G': case 'H': case 'I': case 'J': - case 'K': case 'L': case 'M': case 'N': case 'O': + case 'K': /*case 'L':*/ case 'M': case 'N': case 'O': case 'P': case 'Q': case 'R': case 'S': case 'T': case 'U': case 'V': case 'W': case 'X': case 'Y': case 'Z': @@ -274,6 +274,7 @@ main (int argc, char **argv) usage (EXIT_FAILURE); break; + case 'L': /* -L is not documented, but is for procps compatibility. */ case 't': table = true; /* Fall through. */ diff --git a/tests/misc/kill.sh b/tests/misc/kill.sh index 61f8498ab9..05035684bf 100755 --- a/tests/misc/kill.sh +++ b/tests/misc/kill.sh @@ -42,6 +42,7 @@ env kill -0 -1 || fail=1 # to group # table listing env kill -l || fail=1 env kill -t || fail=1 +env kill -L || fail=1 # bash compat env kill -t TERM || fail=1 # Verify name to signal number and vice versa -- 2.47.2