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>

1 files changed, 6 insertions, 3 deletions

diff --git a/shell/ash.c b/shell/ash.c
index c909cae2b..d7355ce81 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -12267,13 +12267,16 @@ trapcmd(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
                 for (signo = 0; signo < NSIG; signo++) {
                         char *tr = trap_ptr[signo];
                         if (tr) {
-                                out1fmt("trap -- %s %s%s\n",
+                                /* 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: */
+                                out1fmt("trap -- %s %s\n",
                                                 single_quote(tr),
-                                                (signo == 0 ? "" : "SIG"),
                                                 get_signame(signo));
                 /* trap_ptr != trap only if we are in special-cased `trap` code.
                  * In this case, we will exit very soon, no need to free(). */
-                                /* if (trap_ptr != trap) */
+                                /* if (trap_ptr != trap && tp[0]) */
                                 /*      free(tr); */
                         }
                 }