mirror/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2024-09-28 15:01:21 +02:00
Code

43669: ensure explicit exit status is used over implicit

Browse Source
This commit is contained in:
Peter Stephenson 2018-10-10 11:17:58 +01:00
parent 46c448cf9b
commit 0d3a786b7c
4 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2018-10-10 Peter Stephenson <p.stephenson@samsung.com>
* 43669: Src/builtin.c, Src/init.c, Test/C03traps.ztst: ensure
explicit exit status is used rather than implicit.
2018-10-09 Peter Stephenson <p.stephenson@samsung.com>
* 43660: Src/builtin.c, Src/exec.c, Src/init.c,

4
Src/builtin.c
View File

@ -5723,7 +5723,7 @@ int exit_val;
void
realexit(void)
{
exit(exit_val ? exit_val : lastval);
exit((shell_exiting || exit_pending) ? exit_val : lastval);
}
/* As realexit(), but call _exit instead */
@ -5732,7 +5732,7 @@ realexit(void)
void
_realexit(void)
{
_exit(exit_val ? exit_val : lastval);
_exit((shell_exiting || exit_pending) ? exit_val : lastval);
}
/* exit the shell. val is the return value of the shell. *

2
Src/init.c
View File

@ -1358,7 +1358,7 @@ init_misc(char *cmd, char *zsh_name)
bshin = fdopen(SHIN, "r");
execstring(cmd, 0, 1, "cmdarg");
stopmsg = 1;
zexit(exit_val ? exit_val : lastval, 0);
zexit((exit_pending || shell_exiting) ? exit_val : lastval, 0);
}
if (interact && isset(RCS))

3
Test/C03traps.ztst
View File

@ -872,6 +872,9 @@ F:Must be tested with a top-level script rather than source or function
$ZTST_testdir/../Src/zsh -fc 'fn() { exit 13; }; trap fn EXIT'
13:Explicit exit in exit trap overrides implicit exit status
$ZTST_testdir/../Src/zsh -fc 'fn() { exit 0; }; trap fn EXIT; false'
0:Explicit exit status 0 in exit trap overrides implicit non-zero status
%clean
rm -f TRAPEXIT