emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ash: fix error code regression

Browse Source 
The commit 'ash,hush: set exit code 127 in "sh /does/not/exist" case'
only partly implemented the dash commit '[ERROR] Allow the originator
of EXERROR to set the exit status'.  This resulted in incorrect error
codes for a syntax error:

   $ )
   $ echo $?
   0

or a redirection error for a special builtin:

   $ rm -f xxx
   $ eval cat <xxx
   $ echo $?
   0

Signed-off-by: Ron Yorston <rmy@pobox.com>
Reported-by: Martijn Dekker <martijn@inlv.org>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Ron Yorston
2017-01-03 11:18:23 +01:00
committed by Denys Vlasenko
parent bddbeb82bf
commit ea7d2f6ec0
5 changed files with 38 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
shell/ash.c
View File

@ -1284,6 +1284,8 @@ ash_msg_and_raise_error(const char *msg, ...)
{
va_list ap;
exitstatus = 2;
va_start(ap, msg);
ash_vmsg_and_raise(EXERROR, msg, ap);
/* NOTREACHED */
@ -9588,11 +9590,13 @@ evalcommand(union node *cmd, int flags)
}
if (status) {
bail:
exitstatus = status;
/* We have a redirection error. */
if (spclbltin > 0)
raise_exception(EXERROR);
bail:
exitstatus = status;
goto out;
}