RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 20:28:11 +00:00
Code Issues Activity Actions

LibC: Add execvpe() and make execvp()'ed children inherit environment.

Browse source
This commit is contained in:
Andreas Kling 2019-04-26 03:16:26 +02:00
parent 0a68e0046f
commit 490e89e240
3 changed files with 13 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

15
LibC/unistd.cpp
View file

@ -45,11 +45,11 @@ int execve(const char* filename, char* const argv[], char* const envp[])
__RETURN_WITH_ERRNO(rc, rc, -1);
}
int execvp(const char* filename, char* const argv[])
int execvpe(const char* filename, char* const argv[], char* const envp[])
{
int rc = execve(filename, argv, nullptr);
int rc = execve(filename, argv, environ);
if (rc < 0 && errno != ENOENT) {
printf("execvp failed on first with %s\n", strerror(errno));
fprintf(stderr, "execvpe() failed on first with %s\n", strerror(errno));
return rc;
}
String path = getenv("PATH");
@ -58,9 +58,9 @@ int execvp(const char* filename, char* const argv[])
auto parts = path.split(':');
for (auto& part : parts) {
auto candidate = String::format("%s/%s", part.characters(), filename);
rc = execve(candidate.characters(), argv, environ);
int rc = execve(candidate.characters(), argv, environ);
if (rc < 0 && errno != ENOENT) {
printf("execvp failed on attempt (%s) with %s\n", candidate.characters(), strerror(errno));
printf("execvpe() failed on attempt (%s) with %s\n", candidate.characters(), strerror(errno));
return rc;
}
}
@ -68,6 +68,11 @@ int execvp(const char* filename, char* const argv[])
return -1;
}
int execvp(const char* filename, char* const argv[])
{
return execvpe(filename, argv, environ);
}
int execl(const char* filename, const char* arg0, ...)
{
Vector<const char*, 16> args;