diff options
author | Denys Vlasenko <vda.linux@googlemail.com> | 2017-01-08 17:19:38 +0100 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2017-01-08 17:19:38 +0100 |
commit | 1125d7d6801940a5218b74c8fd46f1eaa2e4de39 (patch) | |
tree | ec8b07c2799e6d538f0aaf63ab51497904580504 /procps | |
parent | d5b5c2fa151d318fa96778d5871e23ede312e5fa (diff) |
hush: kill builtin and kill %jobspec support
Also made it and printf, type and wait builtins optional.
function old new delta
builtin_kill - 323 +323
bltins1 336 348 +12
builtin_type 114 116 +2
------------------------------------------------------------------------------
(add/remove: 1/0 grow/shrink: 2/0 up/down: 337/0) Total: 337 bytes
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'procps')
-rw-r--r-- | procps/Kbuild.src | 2 | ||||
-rw-r--r-- | procps/kill.c | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/procps/Kbuild.src b/procps/Kbuild.src index e7adc7340..82f37f0df 100644 --- a/procps/Kbuild.src +++ b/procps/Kbuild.src @@ -11,3 +11,5 @@ INSERT lib-$(CONFIG_ASH) += kill.o # used for built-in kill by ash lib-$(CONFIG_SH_IS_ASH) += kill.o # used for built-in kill by ash lib-$(CONFIG_BASH_IS_ASH) += kill.o # used for built-in kill by ash + +lib-$(CONFIG_HUSH_KILL) += kill.o # used for built-in kill by hush diff --git a/procps/kill.c b/procps/kill.c index 36cd22f37..579c8e53c 100644 --- a/procps/kill.c +++ b/procps/kill.c @@ -285,8 +285,8 @@ int kill_main(int argc UNUSED_PARAM, char **argv) /* Looks like they want to do a kill. Do that */ while (arg) { -#if ENABLE_ASH || ENABLE_SH_IS_ASH || ENABLE_BASH_IS_ASH \ - || ENABLE_HUSH || ENABLE_SH_IS_HUSH || ENABLE_BASH_IS_HUSH +#if ENABLE_ASH || ENABLE_SH_IS_ASH || ENABLE_BASH_IS_ASH \ + || ENABLE_HUSH_KILL /* * We need to support shell's "hack formats" of * " -PRGP_ID" (yes, with a leading space) |