summaryrefslogtreecommitdiff
path: root/shell/hush.c
diff options
context:
space:
mode:
authorDenys Vlasenko2009-09-27 02:05:45 +0200
committerDenys Vlasenko2009-09-27 02:05:45 +0200
commite74aaf93854b9453b9949954aec77710b257d8b6 (patch)
tree0be4c4457b9567427706871bfb62fafa296eca19 /shell/hush.c
parent6c750f15180ba51ef37c6cfa381b52e6b05d55aa (diff)
downloadbusybox-e74aaf93854b9453b9949954aec77710b257d8b6.zip
busybox-e74aaf93854b9453b9949954aec77710b257d8b6.tar.gz
ash,hush: make trap output short signal names, without SIG prefix
function old new delta evalvar 1373 1371 -2 builtin_trap 457 441 -16 trapcmd 260 236 -24 Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'shell/hush.c')
-rw-r--r--shell/hush.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/shell/hush.c b/shell/hush.c
index d75b0da..b515eab 100644
--- a/shell/hush.c
+++ b/shell/hush.c
@@ -7111,8 +7111,11 @@ static int FAST_FUNC builtin_trap(char **argv)
if (G.traps[i]) {
printf("trap -- ");
print_escaped(G.traps[i]);
- /* bash compat: it says SIGxxx, not just xxx */
- printf(" %s%s\n", i == 0 ? "" : "SIG", get_signame(i));
+ /* note: bash adds "SIG", but only if invoked
+ * as "bash". If called as "sh", or if set -o posix,
+ * then it prints short signal names.
+ * We are printing short names: */
+ printf(" %s\n", get_signame(i));
}
}
/*fflush(stdout); - done after each builtin anyway */