summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPádraig Brady <P@draigBrady.com>2015-12-13 19:54:27 +0000
committerPádraig Brady <P@draigBrady.com>2015-12-14 13:37:22 +0000
commit03bef9178163351c72af7fc494a40411610bc227 (patch)
tree5c1812edb0b7b1adf7618a789c8292bc913ec12e
parentfc8e71997336b7119d0781278d2bdf91587af1ef (diff)
downloadcoreutils-03bef9178163351c72af7fc494a40411610bc227.tar.xz
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.
-rw-r--r--src/kill.c7
-rwxr-xr-xtests/misc/kill.sh1
2 files changed, 5 insertions, 3 deletions
diff --git a/src/kill.c b/src/kill.c
index 2913d99a6..1d0171bf0 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 61f8498ab..05035684b 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