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

Make eval override previous status

Browse Source 
Closes #5692 (again).
This commit is contained in:
Mahmoud Al-Qudsi
2019-04-13 13:05:04 -05:00
parent 47a61a3202
commit 8e4010b263
3 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/exec.cpp
View File

@@ -864,6 +864,14 @@ static bool exec_block_or_func_process(parser_t &parser, std::shared_ptr<job_t>
return true;
}
// The number of overall "command" executions, for whatever definition of "command". Its delta
// is used to determine the number of recursive `exec_process_in_job()` invocations.
static size_t exec_count = 0;
size_t exec_get_exec_count() {
return exec_count;
}
/// Executes a process \p in job \j, using the pipes \p pipes (which may have invalid fds if this is
/// the first or last process).
/// \p deferred_pipes represents the pipes from our deferred process; if set ensure they get closed
@@ -926,9 +934,6 @@ static bool exec_process_in_job(parser_t &parser, process_t *p, std::shared_ptr<
}
}
// The number of overall "command" executions, for whatever definition of "command". Its delta
// is used to determine the number of recursive `exec_process_in_job()` invocations.
static size_t exec_count = 0;
if (p->type != process_type_t::block_node) {
// An simple `begin ... end` should not be considered an execution of a command.
exec_count++;