Another halloc:ification of fish. Halloc has been extended to allow registering function calls, this has allowed the creation of halloc-handled arraylists, stringbuffers, etc. More job parsing halloc-ification has reduced the error handling code to only a shadow of it's former self

darcs-hash:20060209155020-ac50b-e119c5293ce2368e252cfc01b98ab7c629fdd678.gz

1 files changed, 16 insertions, 4 deletions

diff --git a/signal.c b/signal.c
index d6f3be8c..dbd3b701 100644
--- a/signal.c
+++ b/signal.c
@@ -43,6 +43,9 @@ struct lookup_entry
 	const wchar_t *desc;	
 };
 
+static int block_count=0;
+
+
 /**
    Lookup table used to convert between signal names and signal ids,
    etc.
@@ -536,13 +539,22 @@ void signal_handle( int sig, int do_handle )
 void signal_block()
 {
 	sigset_t chldset; 
-	sigfillset( &chldset );
-	sigprocmask(SIG_BLOCK, &chldset, 0);	
+	
+	if( !block_count )
+	{
+		sigfillset( &chldset );
+		sigprocmask(SIG_BLOCK, &chldset, 0);	
+	}
+	block_count++;
 }
 
 void signal_unblock()
 {
 	sigset_t chldset; 
-	sigfillset( &chldset );
-	sigprocmask(SIG_UNBLOCK, &chldset, 0);	
+	block_count--;
+	if( !block_count )
+	{
+		sigfillset( &chldset );
+		sigprocmask(SIG_UNBLOCK, &chldset, 0);	
+	}
 }