]> CyberLeo.Net >> Repos - FreeBSD/stable/8.git/commit
MFC r230212:
authordumbbell <dumbbell@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Mon, 6 Feb 2012 13:36:49 +0000 (13:36 +0000)
committerdumbbell <dumbbell@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Mon, 6 Feb 2012 13:36:49 +0000 (13:36 +0000)
commit4fbe9a5298673fee9f7b11cf0a7a62b77f26ae58
treec3a92d4ef147a05ff586683f793ddc607b0048a5
parent6e3b75f95e20e3bf24bb1664831186344952d25f
MFC r230212:
sh: Fix execution of multiple statements in a trap when evalskip is set

Before this fix, only the first statement of the trap was executed if
evalskip was set. This is for example the case when:
    o  "-e" is set for this shell
    o  a trap is set on EXIT
    o  a function returns 1 and causes the script to abort

Reviewed by: jilles
Sponsored by: Yakaz (http://www.yakaz.com)

git-svn-id: svn://svn.freebsd.org/base/stable/8@231086 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
bin/sh/eval.c
bin/sh/eval.h
bin/sh/trap.c
tools/regression/bin/sh/builtins/trap10.0 [new file with mode: 0644]
tools/regression/bin/sh/builtins/trap11.0 [new file with mode: 0644]