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

Make is_event and other globals part of parser_t libdata

Browse Source
This commit is contained in:
ridiculousfish
2019-05-12 18:02:57 -07:00
parent c44dae2d73
commit 508c3a8005
10 changed files with 41 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/exec.cpp
View File

@@ -1130,7 +1130,7 @@ bool exec_job(parser_t &parser, shared_ptr<job_t> j) {
static int exec_subshell_internal(const wcstring &cmd, parser_t &parser, wcstring_list_t *lst,
bool apply_exit_status, bool is_subcmd) {
ASSERT_IS_MAIN_THREAD();
bool prev_subshell = is_subshell;
bool prev_subshell = parser.libdata().is_subshell;
auto prev_statuses = parser.get_last_statuses();
bool split_output = false;
@@ -1139,7 +1139,7 @@ static int exec_subshell_internal(const wcstring &cmd, parser_t &parser, wcstrin
split_output = true;
}
is_subshell = true;
parser.libdata().is_subshell = true;
auto subcommand_statuses = statuses_t::just(-1); // assume the worst
// IO buffer creation may fail (e.g. if we have too many open files to make a pipe), so this may
@@ -1165,7 +1165,7 @@ static int exec_subshell_internal(const wcstring &cmd, parser_t &parser, wcstrin
parser.set_last_statuses(std::move(prev_statuses));
}
is_subshell = prev_subshell;
parser.libdata().is_subshell = prev_subshell;
if (lst == NULL || !buffer) {
return subcommand_statuses.status;