beenull/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-11-26 01:20:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

LibC: Fix execvpe() exiting with bad errno when giving up.

Browse source 
This is still not perfect, but at least it fixes one such issue.
This commit is contained in:
Andreas Kling 2019-07-25 07:01:00 +02:00
parent 0846986cac
commit f186c018f1
Notes: sideshowbarker 2024-07-19 13:04:13 +09:00 
Author: https://github.com/awesomekling
Commit: https://github.com/SerenityOS/serenity/commit/f186c018f14
1 changed files with 20 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
Libraries/LibC/unistd.cpp
View file

@ -53,22 +53,26 @@ int execve(const char* filename, char* const argv[], char* const envp[])
int execvpe(const char* filename, char* const argv[], char* const envp[]) int execvpe(const char* filename, char* const argv[], char* const envp[])
{ {
int rc = execve(filename, argv, envp); // NOTE: We scope everything here to make sure that setting errno on exit is sticky.
if (rc < 0 && errno != ENOENT) { {
fprintf(stderr, "execvpe() failed on first with %s\n", strerror(errno)); int rc = execve(filename, argv, envp);
return rc;
}
String path = getenv("PATH");
if (path.is_empty())
path = "/bin:/usr/bin";
auto parts = path.split(':');
for (auto& part : parts) {
auto candidate = String::format("%s/%s", part.characters(), filename);
int rc = execve(candidate.characters(), argv, envp);
if (rc < 0 && errno != ENOENT) { if (rc < 0 && errno != ENOENT) {
printf("execvpe() failed on attempt (%s) with %s\n", candidate.characters(), strerror(errno)); dbg() << "execvpe() failed on first with" << strerror(errno);
return rc; return rc;
} }
String path = getenv("PATH");
if (path.is_empty())
path = "/bin:/usr/bin";
auto parts = path.split(':');
for (auto& part : parts) {
auto candidate = String::format("%s/%s", part.characters(), filename);
int rc = execve(candidate.characters(), argv, envp);
if (rc < 0 && errno != ENOENT) {
dbg() << "execvpe() failed on attempt (" << candidate << ") with " << strerror(errno);
return rc;
}
}
dbg() << "execvpe() leaving :(";
} }
errno = ENOENT; errno = ENOENT;
return -1; return -1;
@ -76,7 +80,9 @@ int execvpe(const char* filename, char* const argv[], char* const envp[])
int execvp(const char* filename, char* const argv[]) int execvp(const char* filename, char* const argv[])
{ {
return execvpe(filename, argv, environ); int rc = execvpe(filename, argv, environ);
dbg() << "execvp() about to return " << rc << " with errno=" << errno;
return rc;
} }
int execl(const char* filename, const char* arg0, ...) int execl(const char* filename, const char* arg0, ...)
@ -531,5 +537,4 @@ void dump_backtrace()
{ {
syscall(SC_dump_backtrace); syscall(SC_dump_backtrace);
} }
} }