mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2026-01-04 09:01:06 +01:00
Code Releases Activity

28791: exit on errors with special builtins with POSIXBUILTINS

Browse source
This commit is contained in:
Peter Stephenson 2011-02-22 20:09:20 +00:00
parent 73ebca4fe9
commit dbbcbf67cb
5 changed files with 82 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,9 @@
2011-02-22 Peter Stephenson <p.w.stephenson@ntlworld.com>
* 28791: Doc/Zsh/options.yo, Src/builtin.c, Src/exec.c,
Test/A04redirect.ztst: exit on errors in special builtins
with POSIXBUILTINS.
2011-02-21 Peter Stephenson <pws@csr.com>
* 28783: Doc/Zsh/options.yo, Src/lex.c, Test/A01grammar.ztst:
@ -14242,5 +14248,5 @@
*****************************************************
* This is used by the shell to define $ZSH_PATCHLEVEL
* $Revision: 1.5205 $
* $Revision: 1.5206 $
*****************************************************

6
Doc/Zsh/options.yo
View file

@ -1871,9 +1871,9 @@ tt(times),
tt(trap) and
tt(unset).
In addition, a failed redirection after tt(exec) causes a non-interactive
shell to exit and an interactive shell to return to its top-level
processing.
In addition, various error conditions associated with the above builtins
or tt(exec) cause a non-interactive shell to exit and an interactive
shell to return to its top-level processing.
)
pindex(POSIX_IDENTIFIERS)
pindex(NO_POSIX_IDENTIFIERS)

10
Src/builtin.c
View file

@ -4821,8 +4821,14 @@ bin_dot(char *name, char **argv, UNUSED(Options ops), UNUSED(int func))
freearray(pparams);
pparams = old;
}
if (ret == SOURCE_NOT_FOUND)
zwarnnam(name, "%e: %s", errno, enam);
if (ret == SOURCE_NOT_FOUND) {
if (isset(POSIXBUILTINS)) {
/* hard error in POSIX (we'll exit later) */
zerrnam(name, "%e: %s", errno, enam);
} else {
zwarnnam(name, "%e: %s", errno, enam);
}
}
zsfree(arg0);
if (old0) {
zsfree(argzero);

22
Src/exec.c
View file

@ -2416,6 +2416,8 @@ execcmd(Estate state, int input, int output, int how, int last1)
checked = !(cflags & BINF_BUILTIN);
break;
}
cflags &= ~BINF_BUILTIN & ~BINF_COMMAND;
cflags |= hn->flags;
if (!(hn->flags & BINF_PREFIX)) {
is_builtin = 1;
@ -2425,8 +2427,6 @@ execcmd(Estate state, int input, int output, int how, int last1)
assign = (hn->flags & BINF_MAGICEQUALS);
break;
}
cflags &= ~BINF_BUILTIN & ~BINF_COMMAND;
cflags |= hn->flags;
checked = 0;
if ((cflags & BINF_COMMAND) && nextnode(firstnode(args))) {
/* check for options to command builtin */
@ -3297,12 +3297,20 @@ execcmd(Estate state, int input, int output, int how, int last1)
fixfds(save);
done:
if (redir_err && isset(POSIXBUILTINS)) {
if (!isset(INTERACTIVE)) {
/* We've already _exit'ed if forked */
exit(1);
if (isset(POSIXBUILTINS) &&
(cflags & (BINF_PSPECIAL|BINF_EXEC))) {
/*
* For POSIX-compatibile behaviour with special
* builtins (including exec which we don't usually
* classify as a builtin, we treat all errors as fatal.
*/
if (redir_err || errflag) {
if (!isset(INTERACTIVE)) {
/* We've already _exit'ed if forked */
exit(1);
}
errflag = 1;
}
errflag = 1;
}
if (newxtrerr) {
fil = fileno(newxtrerr);

49
Test/A04redirect.ztst
View file

@ -378,3 +378,52 @@
echo output'
1:failed exec redir, POSIX_BUILTINS
?zsh:2: no such file or directory: /nonexistent/nonexistent
$ZTST_testdir/../Src/zsh -f -o POSIX_BUILTINS -c '
set >/nonexistent/nonexistent
echo output'
1:failed special builtin redir, POSIX_BUILTINS
?zsh:2: no such file or directory: /nonexistent/nonexistent
$ZTST_testdir/../Src/zsh -f -o POSIX_BUILTINS -c '
echo >/nonexistent/nonexistent
echo output'
0:failed unspecial builtin redir, POSIX_BUILTINS
>output
?zsh:2: no such file or directory: /nonexistent/nonexistent
$ZTST_testdir/../Src/zsh -f -o POSIX_BUILTINS -c '
. /nonexistent/nonexistent
echo output'
1:failed dot, POSIX_BUILTINS
?zsh:.:2: no such file or directory: /nonexistent/nonexistent
$ZTST_testdir/../Src/zsh -f -c '
. /nonexistent/nonexistent
echo output'
0:failed dot, NO_POSIX_BUILTINS
>output
?zsh:.:2: no such file or directory: /nonexistent/nonexistent
$ZTST_testdir/../Src/zsh -f <<<'
readonly foo
foo=bar set output
echo output'
0:failed assignment on posix special, NO_POSIX_BUILTINS
>output
?zsh: read-only variable: foo
$ZTST_testdir/../Src/zsh -f -o POSIX_BUILTINS <<<'
readonly foo
foo=bar set output
echo output'
1:failed assignment on posix special, POSIX_BUILTINS
?zsh: read-only variable: foo
$ZTST_testdir/../Src/zsh -f -o POSIX_BUILTINS <<<'
readonly foo
foo=bar echo output
echo output'
0:failed assignment on non-posix-special, POSIX_BUILTINS
>output
?zsh: read-only variable: foo