h/fish-shell
1
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2026-06-17 19:21:15 -03:00
Code Issues Packages Projects Releases Wiki Activity

Clean up and relnote shebangless script support

Browse Source 
This adds a test for shebangless support from #7802, cleans up some of
its tricks, and includes it in the changelog.
This commit is contained in:
ridiculousfish
2021-03-27 16:07:57 -07:00
parent 0048730a67
commit eb71e4555f
4 changed files with 93 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/postfork.cpp
View File

@@ -309,15 +309,15 @@ maybe_t<pid_t> posix_spawner_t::spawn(const char *cmd, char *const argv[], char
// line needs to exist before the first \0 with a lowercase letter
if (error_ == ENOEXEC && is_thompson_shell_script(cmd)) {
error_ = 0;
size_t n = 0;
while (argv[n]) ++n;
std::unique_ptr<char *[]> argv2(new char *[1 + n + 1]);
// Create a new argv with /bin/sh prepended.
std::vector<char *> argv2;
char interp[] = _PATH_BSHELL;
argv2[0] = interp;
for (size_t i = 0; i < n + 1; ++i) {
argv2[i + 1] = argv[i];
argv2.push_back(interp);
for (size_t i = 0; argv[i] != nullptr; i++) {
argv2.push_back(argv[i]);
}
if (check_fail(posix_spawn(&pid, interp, &*actions_, &*attr_, argv2.get(), envp))) {
argv2.push_back(nullptr);
if (check_fail(posix_spawn(&pid, interp, &*actions_, &*attr_, &argv2[0], envp))) {
return none();
}
} else {