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>
This commit is contained in:
Denys Vlasenko
2009-09-27 02:05:45 +02:00
parent 6c750f1518
commit e74aaf9385
6 changed files with 28 additions and 22 deletions

View File

@@ -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); */
}
}