h/fish-shell
1
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2026-07-02 17:31:16 -03:00
Code Issues Packages Projects Releases Wiki Activity

Make more miscellaneous globals thread safe

Browse Source
This commit is contained in:
ridiculousfish
2019-04-28 18:13:55 -07:00
parent e2c66a8131
commit 36998eee55
12 changed files with 58 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/parse_execution.cpp
View File

@@ -795,7 +795,6 @@ parse_execution_result_t parse_execution_context_t::populate_plain_process(
}
// Protect against exec with background processes running
static uint32_t last_exec_run_counter = -1;
if (process_type == process_type_t::exec && shell_is_interactive()) {
bool have_bg = false;
for (const auto &bg : jobs()) {
@@ -809,13 +808,13 @@ parse_execution_result_t parse_execution_context_t::populate_plain_process(
}
if (have_bg) {
/* debug(1, "Background jobs remain! run_counter: %u, last_exec_run_count: %u", reader_run_count(), last_exec_run_counter); */
if (isatty(STDIN_FILENO) && reader_run_count() - 1 != last_exec_run_counter) {
uint64_t current_run_count = reader_run_count();
uint64_t &last_exec_run_count = parser->libdata().last_exec_run_counter;
if (isatty(STDIN_FILENO) && current_run_count - 1 != last_exec_run_count) {
reader_bg_job_warning();
last_exec_run_counter = reader_run_count();
last_exec_run_count = current_run_count;
return parse_execution_errored;
}
else {
} else {
hup_background_jobs();
}
}