Signal handling cleanup and improved safety

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

1 files changed, 7 insertions, 10 deletions

diff --git a/signal.cpp b/signal.cpp
index 83a4b13e..dec6187e 100644
--- a/signal.cpp
+++ b/signal.cpp
@@ -427,10 +427,9 @@ const wchar_t *signal_get_desc( int sig )
 */
 static void default_handler(int signal, siginfo_t *info, void *context)
 {
-	event_t e = event_t::signal_event(signal);
-	if( event_get( &e, 0 ) )
-	{
-		event_fire( &e );
+    if (event_is_signal_observed(signal))
+    {
+		event_fire_signal(signal);
 	}
 }
 
@@ -449,16 +448,14 @@ static void handle_winch( int sig, siginfo_t *info, void *context )
 */
 static void handle_hup( int sig, siginfo_t *info, void *context )
 {
-	event_t e = event_t::signal_event(SIGHUP);
-	if( event_get( &e, 0 ) )
+	if (event_is_signal_observed(SIGHUP))
 	{
-		default_handler( sig, 0, 0 );	
+		default_handler(sig, 0, 0);
 	}
 	else
 	{
-		reader_exit( 1, 1 );
-	}
-	
+		reader_exit(1, 1);
+	}	
 }
 
 /**