ash: fix `trap`

function                                             old     new   delta
forkshell                                            738     810     +72
popstring                                            134     140      +6
parse_command                                       1460    1463      +3
evalvar                                             1373    1371      -2
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 3/1 up/down: 81/-2)              Total: 79 bytes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

3 files changed, 14 insertions, 5 deletions

diff --git a/shell/ash_test/ash-signals/savetrap.right b/shell/ash_test/ash-signals/savetrap.right
new file mode 100644
index 000000000..2d33427aa
--- /dev/null
+++ b/shell/ash_test/ash-signals/savetrap.right
@@ -0,0 +1,3 @@
+trap -- 'echo WINCH!' SIGWINCH
+trap -- 'echo WINCH!' SIGWINCH
+Done
diff --git a/shell/ash_test/ash-signals/savetrap.tests b/shell/ash_test/ash-signals/savetrap.tests
new file mode 100755
index 000000000..6492e86a2
--- /dev/null
+++ b/shell/ash_test/ash-signals/savetrap.tests
@@ -0,0 +1,6 @@
+trap 'echo WINCH!' SIGWINCH
+v=` trap   `
+echo $v
+v=`trap`
+echo $v
+echo Done
diff --git a/shell/ash_test/ash-signals/signal1.right b/shell/ash_test/ash-signals/signal1.right
index cf403ac62..beb0a988e 100644
--- a/shell/ash_test/ash-signals/signal1.right
+++ b/shell/ash_test/ash-signals/signal1.right
@@ -1,20 +1,20 @@
 got signal
-trap -- 'echo got signal' USR1
+trap -- 'echo got signal' SIGUSR1
 sent 1 signal
 got signal
 wait interrupted
-trap -- 'echo got signal' USR1
+trap -- 'echo got signal' SIGUSR1
 sent 2 signal
 got signal
 wait interrupted
-trap -- 'echo got signal' USR1
+trap -- 'echo got signal' SIGUSR1
 sent 3 signal
 got signal
 wait interrupted
-trap -- 'echo got signal' USR1
+trap -- 'echo got signal' SIGUSR1
 sent 4 signal
 got signal
 wait interrupted
-trap -- 'echo got signal' USR1
+trap -- 'echo got signal' SIGUSR1
 sent 5 signal
 sleep completed