aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKang-Che Sung <explorer09@gmail.com>2017-01-08 14:27:34 +0100
committerDenys Vlasenko <vda.linux@googlemail.com>2017-01-08 14:27:34 +0100
commita474728e82510aa98995f02ac53ca7207b0baf76 (patch)
tree1e45be62c49008faac9e63cb39fdc8ca2f691ce8
parent0ffac1cc22e3e864e64c1e0357ffd127fd1c1b23 (diff)
downloadbusybox-w32-a474728e82510aa98995f02ac53ca7207b0baf76.tar.gz
busybox-w32-a474728e82510aa98995f02ac53ca7207b0baf76.tar.bz2
busybox-w32-a474728e82510aa98995f02ac53ca7207b0baf76.zip
ash: fix "kill %1" not working if CONFIG_ASH is disabled
ix ash "kill %1" not working if CONFIG_ASH is disabled but ash is launched by 'sh' or 'bash' name Signed-off-by: Kang-Che Sung <explorer09@gmail.com> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r--procps/kill.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/procps/kill.c b/procps/kill.c
index 57a33bcaa..36cd22f37 100644
--- a/procps/kill.c
+++ b/procps/kill.c
@@ -285,7 +285,8 @@ int kill_main(int argc UNUSED_PARAM, char **argv)
285 285
286 /* Looks like they want to do a kill. Do that */ 286 /* Looks like they want to do a kill. Do that */
287 while (arg) { 287 while (arg) {
288#if ENABLE_ASH || ENABLE_HUSH 288#if ENABLE_ASH || ENABLE_SH_IS_ASH || ENABLE_BASH_IS_ASH \
289 || ENABLE_HUSH || ENABLE_SH_IS_HUSH || ENABLE_BASH_IS_HUSH
289 /* 290 /*
290 * We need to support shell's "hack formats" of 291 * We need to support shell's "hack formats" of
291 * " -PRGP_ID" (yes, with a leading space) 292 * " -PRGP_ID" (yes, with a leading space)