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

fixup! Recover from bad redirections in the middle of a job pipeline

Browse Source 
Fix inadvertent early abort (thanks, nested switch-in-for-loop!) that
led to subsequent shell input being broken.
This commit is contained in:
Mahmoud Al-Qudsi
2020-05-30 10:37:41 -05:00
parent fd7bb14cf2
commit f4ae69a905
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/io.cpp
View File

@@ -227,6 +227,7 @@ void io_chain_t::append(const io_chain_t &chain) {
}
bool io_chain_t::append_from_specs(const redirection_spec_list_t &specs, const wcstring &pwd) {
bool have_error = false;
for (const auto &spec : specs) {
switch (spec.mode) {
case redirection_mode_t::fd: {
@@ -257,14 +258,15 @@ bool io_chain_t::append_from_specs(const redirection_spec_list_t &specs, const w
// and return false. This lets execution potentially recover and at least gives
// the shell a chance to gracefully regain control of the shell (see #7038).
this->push_back(make_unique<io_close_t>(spec.fd));
return false;
have_error = true;
break;
}
this->push_back(std::make_shared<io_file_t>(spec.fd, std::move(file)));
break;
}
}
}
return true;
return !have_error;
}
void io_chain_t::print() const {