Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2024-12-26 12:53:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

Minor edit of comments

Browse source 
darcs-hash:20060729173159-ac50b-f126469f9a6f221d94696d6292ca9a6c79a7a6e6.gz
This commit is contained in:
axel 2006-07-30 03:31:59 +10:00
parent db369a9ad7
commit bdd83d338c
1 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
event.c
View file

@ -391,9 +391,9 @@ static int event_is_killed( event_t *e )
/** /**
Perform the specified event. Since almost all event firings will Perform the specified event. Since almost all event firings will
not match a single event handler, we make sureto optimize the 'no not be matched by even a single event handler, we make sure to
matches' path. This means that nothing is allocated/initialized optimize the 'no matches' path. This means that nothing is
unless that is needed. allocated/initialized unless needed.
*/ */
static void event_fire_internal( event_t *event ) static void event_fire_internal( event_t *event )
{ {
@ -473,7 +473,7 @@ static void event_fire_internal( event_t *event )
/* /*
Event handlers are not part of the main flow of code, so Event handlers are not part of the main flow of code, so
they are marked as non-interactive and as a subshell they are marked as non-interactive
*/ */
proc_push_interactive(0); proc_push_interactive(0);
parser_push_block( EVENT ); parser_push_block( EVENT );
@ -510,6 +510,13 @@ static void event_fire_delayed()
int i; int i;
/*
If is_event is one, we are running the event-handler non-recursively.
When the event handler has called a piece of code that triggers
another event, we do not want to fire delayed events because of
concurrency problems.
*/
if( blocked && is_event==1) if( blocked && is_event==1)
{ {
array_list_t *new_blocked = 0; array_list_t *new_blocked = 0;
@ -594,7 +601,7 @@ void event_fire( event_t *event )
/* /*
This means we are in a signal handler. We must be very This means we are in a signal handler. We must be very
careful not do do anything that could cause a memory careful not do do anything that could cause a memory
allocation or something else that might be illegal in a allocation or something else that might be bad when in a
signal handler. signal handler.
*/ */
if( sig_list[active_list].count < SIG_UNHANDLED_MAX ) if( sig_list[active_list].count < SIG_UNHANDLED_MAX )