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

ash: exec: Return 126 on most errors in shellexec

Browse Source 
Upstream commit:

    Date: Sat, 19 May 2018 02:39:37 +0800
    exec: Return 126 on most errors in shellexec

    Currently when shellexec fails on most errors the shell will exit
    with exit status 2.  This patch changes it to 126 in order to avoid
    ambiguities with the exit status from a successful exec.

    The errors that result in 127 has also been expanded to include
    ENOTDIR, ENAMETOOLONG and ELOOP.

    Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

function                                             old     new   delta
shellexec                                            245     254      +9

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2018-08-05 18:04:09 +02:00
parent 1c5eb88cd8
commit 2596f412cd
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
shell/ash.c
View File

@ -8098,15 +8098,15 @@ static void shellexec(char *prog, char **argv, const char *path, int idx)
/* Map to POSIX errors */
switch (e) {
case EACCES:
default:
exerrno = 126;
break;
case ELOOP:
case ENAMETOOLONG:
case ENOENT:
case ENOTDIR:
exerrno = 127;
break;
default:
exerrno = 2;
break;
}
exitstatus = exerrno;
TRACE(("shellexec failed for %s, errno %d, suppress_int %d\n",