LadybirdBrowser/ladybird
1
1
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-09-20 09:49:15 +03:00
Code Issues Packages Projects Releases Wiki Activity

Shell: Actually make shebangs work

Browse Source 
Also check for executable permissions before actually trying to run, and
print a helpful message if not executable.
Fixes #4358
This commit is contained in:
AnotherTest 2020-12-09 01:49:58 +03:30 committed by Andreas Kling
parent 0141f7e7fd
commit 17e1e1f114
Notes: sideshowbarker 2024-07-19 00:58:22 +09:00 
Author: https://github.com/alimpfard
Commit: https://github.com/SerenityOS/serenity/commit/17e1e1f1147
Pull-request: https://github.com/SerenityOS/serenity/pull/4359
Issue: https://github.com/SerenityOS/serenity/issues/4345
Issue: https://github.com/SerenityOS/serenity/issues/4358
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Shell/Shell.cpp
View File

@ -787,7 +787,17 @@ RefPtr<Job> Shell::run_command(const AST::Command& command)
int rc = execvp(argv[0], const_cast<char* const*>(argv.data()));
if (rc < 0) {
if (errno == ENOENT) {
int saved_errno = errno;
struct stat st;
if (stat(argv[0], &st)) {
fprintf(stderr, "stat(%s): %s\n", argv[0], strerror(errno));
_exit(126);
}
if (!(st.st_mode & S_IXUSR)) {
fprintf(stderr, "%s: Not executable\n", argv[0]);
_exit(126);
}
if (saved_errno == ENOENT) {
int shebang_fd = open(argv[0], O_RDONLY);
auto close_argv = ScopeGuard([shebang_fd]() { if (shebang_fd >= 0) close(shebang_fd); });
char shebang[256] {};
@ -796,13 +806,14 @@ RefPtr<Job> Shell::run_command(const AST::Command& command)
StringView shebang_path_view(&shebang[2], num_read - 2);
Optional<size_t> newline_pos = shebang_path_view.find_first_of("\n\r");
shebang[newline_pos.has_value() ? (newline_pos.value() + 2) : num_read] = '\0';
fprintf(stderr, "%s: Invalid interpreter \"%s\": %s\n", argv[0], &shebang[2], strerror(ENOENT));
argv[0] = shebang;
int rc = execvp(argv[0], const_cast<char* const*>(argv.data()));
if (rc < 0)
fprintf(stderr, "%s: Invalid interpreter \"%s\": %s\n", argv[0], &shebang[2], strerror(errno));
} else
fprintf(stderr, "%s: Command not found.\n", argv[0]);
} else {
int saved_errno = errno;
struct stat st;
if (stat(argv[0], &st) == 0 && S_ISDIR(st.st_mode)) {
if (S_ISDIR(st.st_mode)) {
fprintf(stderr, "Shell: %s: Is a directory\n", argv[0]);
_exit(126);
}