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

Signal handling cleanup and improved safety

Browse Source 
Fixes issue where you couldn't control-C out of a loop (https://github.com/ridiculousfish/fishfish/issues/13)
Also stops doing memory allocation in the signal handler (oops) https://github.com/ridiculousfish/fishfish/issues/27
This commit is contained in:
ridiculousfish
2012-06-04 14:20:01 -07:00
parent cc90f9cf80
commit 69446be1ee
9 changed files with 104 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
proc.cpp
View File

@@ -399,11 +399,10 @@ static void mark_process_status( const job_t *j,
*/
static void handle_child_status( pid_t pid, int status )
{
int found_proc = 0;
bool found_proc = false;
const job_t *j=0;
process_t *p=0;
// char mess[MESS_SIZE];
found_proc = 0;
/*
snprintf( mess,
MESS_SIZE,
@@ -413,7 +412,7 @@ static void handle_child_status( pid_t pid, int status )
*/
job_iterator_t jobs;
while ((j = jobs.next()))
while (! found_proc && (j = jobs.next()))
{
process_t *prev=0;
for( p=j->first_process; p; p=p->next )
@@ -442,7 +441,7 @@ static void handle_child_status( pid_t pid, int status )
kill(prev->pid,SIGPIPE);
}
}
found_proc = 1;
found_proc = true;
break;
}
prev = p;
@@ -466,15 +465,10 @@ static void handle_child_status( pid_t pid, int status )
}
else
{
//PCA INSTANCED_PARSER what is this?
block_t *c = NULL;//parser.current_block;
/* In an interactive session, tell the principal parser to skip all blocks we're executing so control-C returns control to the user. */
if( p && found_proc )
{
while( c )
{
c->skip=1;
c=c->outer;
}
parser_t::skip_all_blocks();
}
}
}
@@ -499,6 +493,7 @@ static void handle_child_status( pid_t pid, int status )
}
/* This is called from a signal handler */
void job_handle_signal ( int signal, siginfo_t *info, void *con )
{