diff options
| author | Paul Ackersviller <packersv@users.sourceforge.net> | 2007-05-28 05:51:26 +0000 |
|---|---|---|
| committer | Paul Ackersviller <packersv@users.sourceforge.net> | 2007-05-28 05:51:26 +0000 |
| commit | cf4aebc26bbd913cb17e5054e5b1fb3939acdada (patch) | |
| tree | 8541c56ed64da30ab594f6db46f2428a7ddcdbf8 /Src | |
| parent | cfdf88fde87ed098a9ed495589a939a25f5cdd90 (diff) | |
| download | zsh-cf4aebc26bbd913cb17e5054e5b1fb3939acdada.tar.gz zsh-cf4aebc26bbd913cb17e5054e5b1fb3939acdada.tar.xz zsh-cf4aebc26bbd913cb17e5054e5b1fb3939acdada.zip | |
Corrected my incorrectly-resolved merge-conflict of 21296, back at revision 1.133.2.5 on this branch.
Diffstat (limited to 'Src')
| -rw-r--r-- | Src/builtin.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/Src/builtin.c b/Src/builtin.c index c0ad11170..910d73f6d 100644 --- a/Src/builtin.c +++ b/Src/builtin.c @@ -5006,9 +5006,8 @@ bin_trap(char *name, char **argv, UNUSED(Options ops), UNUSED(int func)) shfunctab->printnode(hn, 0); DPUTS(!hn, "BUG: I did not find any trap functions!"); } else if (sigtrapped[sig]) { - const char *name = getsigname(sig); - if (!siglists[sig]) - printf("trap -- '' %s\n", name); + if (!sigfuncs[sig]) + printf("trap -- '' %s\n", sigs[sig]); else { s = getpermtext(sigfuncs[sig], NULL); printf("trap -- "); @@ -5071,7 +5070,7 @@ bin_trap(char *name, char **argv, UNUSED(Options ops), UNUSED(int func)) flags = ZSIG_ALIAS; } t = dupeprog(prog, 0); - if (settrap(sig, t, flags)) + if (settrap(sig, t)) freeeprog(t); } return *argv != NULL; |