summaryrefslogtreecommitdiff
path: root/src/process/execvp.c
diff options
context:
space:
mode:
authorRich Felker <dalias@aerifal.cx>2015-02-03 00:31:35 -0500
committerRich Felker <dalias@aerifal.cx>2015-02-03 00:31:35 -0500
commit14a0117117beed9d54d17819d9a9c3d4200c46ed (patch)
tree42128a7c69fde6192d37a259a6eaf84cf8bfc013 /src/process/execvp.c
parent3559f0b894e4369955f8467b94cb8fda537d2f36 (diff)
downloadmusl-14a0117117beed9d54d17819d9a9c3d4200c46ed.tar.gz
make execvp continue PATH search on EACCES rather than issuing an errror
the specification for execvp itself is unclear as to whether encountering a file that cannot be executed due to EACCES during the PATH search is a mandatory error condition; however, XBD 8.3's specification of the PATH environment variable clarifies that the search continues until a file with "appropriate execution permissions" is found. since it seems undesirable/erroneous to report ENOENT rather than EACCES when an early path element has a non-executable file and all later path elements lack any file by the requested name, the new code stores a flag indicating that EACCES was seen and sets errno back to EACCES in this case.
Diffstat (limited to 'src/process/execvp.c')
-rw-r--r--src/process/execvp.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/process/execvp.c b/src/process/execvp.c
index 7d322003..3a8bbe83 100644
--- a/src/process/execvp.c
+++ b/src/process/execvp.c
@@ -11,6 +11,7 @@ int __execvpe(const char *file, char *const argv[], char *const envp[])
{
const char *p, *z, *path = getenv("PATH");
size_t l, k;
+ int seen_eacces = 0;
errno = ENOENT;
if (!*file) return -1;
@@ -38,9 +39,11 @@ int __execvpe(const char *file, char *const argv[], char *const envp[])
b[z-p] = '/';
memcpy(b+(z-p)+(z>p), file, k+1);
execve(b, argv, envp);
- if (errno != ENOENT) return -1;
+ if (errno == EACCES) seen_eacces = 1;
+ else if (errno != ENOENT) return -1;
if (!*z++) break;
}
+ if (seen_eacces) errno = EACCES;
return -1;
}