d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sh: Do not abort on a redirection error if there is no command word.

Browse Source 
Although simple commands without a command word (only assignments and/or
redirections) are much like special builtins, POSIX and most shells seem to
agree that redirection errors should not abort the shell in this case. Of
course, the assignments persist and assignment errors are fatal.

To get the old behaviour portably, use the ':' special builtin.
To get the new behaviour portably, given that there are no assignments, use
the 'true' regular builtin.
This commit is contained in:
jilles 2010-03-13 22:53:17 +00:00
parent a93ba965a7
commit 6be35ddc1a
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bin/sh/eval.c
View File

@ -680,7 +680,7 @@ evalcommand(union node *cmd, int flags, struct backcmd *backcmd)
/* Variable assignment(s) without command */
cmdentry.cmdtype = CMDBUILTIN;
cmdentry.u.index = BLTINCMD;
cmdentry.special = 1;
cmdentry.special = 0;
} else {
static const char PATH[] = "PATH=";
int cmd_flags = 0, bltinonly = 0;
@ -891,6 +891,12 @@ evalcommand(union node *cmd, int flags, struct backcmd *backcmd)
}
handler = &jmploc;
redirect(cmd->ncmd.redirect, mode);
/*
* If there is no command word, redirection errors should
* not be fatal but assignment errors should.
*/
if (argc == 0 && !(flags & EV_BACKCMD))
cmdentry.special = 1;
if (cmdentry.special)
listsetvar(cmdenviron);
commandname = argv[0];

7
tools/regression/bin/sh/errors/redirection-error4.0 Normal file
View File

@ -0,0 +1,7 @@
# $FreeBSD$
# A redirection error should not abort the shell if there is no command word.
exec 2>/dev/null
</var/empty/x
</var/empty/x y=2
y=2 </var/empty/x
exit 0