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

Early steps towards rationalizing SIGINT handling

Browse Source 
Previously we would try to walk all the blocks (from within the
signal handler!) and mark them as skipped. Stop doing that, it's
wildly unsafe.

Also rationalize how the skip flag is set per block. Remove places
that shouldn't set it (e.g. break and continue shouldn't set skip
on the loop block).
This commit is contained in:
ridiculousfish
2017-01-21 14:15:03 -08:00
parent d8a6c0a91b
commit 9efa897d0d
5 changed files with 20 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/parse_execution.cpp
View File

@@ -220,13 +220,12 @@ parse_execution_context_t::cancellation_reason(const block_t *block) const {
if (parser && parser->cancellation_requested) {
return execution_cancellation_skip;
}
if (block && block->loop_status != LOOP_NORMAL) {
// Nasty hack - break and continue set the 'skip' flag as well as the loop status flag.
return execution_cancellation_loop_control;
}
if (block && block->skip) {
return execution_cancellation_skip;
}
if (block && block->loop_status != LOOP_NORMAL) {
return execution_cancellation_loop_control;
}
return execution_cancellation_none;
}
@@ -485,7 +484,6 @@ parse_execution_result_t parse_execution_context_t::run_for_statement(
const wcstring &val = argument_sequence.at(i);
env_set(for_var_name, val.c_str(), ENV_LOCAL);
fb->loop_status = LOOP_NORMAL;
fb->skip = 0;
this->run_job_list(block_contents, fb);
@@ -494,7 +492,6 @@ parse_execution_result_t parse_execution_context_t::run_for_statement(
if (fb->loop_status == LOOP_CONTINUE) {
// Reset the loop state.
fb->loop_status = LOOP_NORMAL;
fb->skip = false;
continue;
} else if (fb->loop_status == LOOP_BREAK) {
break;
@@ -656,7 +653,6 @@ parse_execution_result_t parse_execution_context_t::run_while_statement(
if (wb->loop_status == LOOP_CONTINUE) {
// Reset the loop state.
wb->loop_status = LOOP_NORMAL;
wb->skip = false;
continue;
} else if (wb->loop_status == LOOP_BREAK) {
break;