From 1468a2571ecda1a15ff1774e195220f95b10e408 Mon Sep 17 00:00:00 2001
From: erickson <erickson@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Date: Mon, 14 Mar 2005 14:09:08 +0000
Subject: [PATCH] added ctrl-c handler to exit the currently running command

git-svn-id: svn://svn.open-ils.org/ILS/trunk@333 dcc99617-32d9-48b4-a31d-7c20da2025e4
---
 OpenSRF/src/srfsh/srfsh.c | 37 ++++++++++++++++++++++++++++++++++---
 OpenSRF/src/srfsh/srfsh.h |  1 +
 2 files changed, 35 insertions(+), 3 deletions(-)

diff --git a/OpenSRF/src/srfsh/srfsh.c b/OpenSRF/src/srfsh/srfsh.c
index a891fd4097..affbcd7e4c 100644
--- a/OpenSRF/src/srfsh/srfsh.c
+++ b/OpenSRF/src/srfsh/srfsh.c
@@ -1,5 +1,7 @@
 #include "srfsh.h"
 
+int caught_sigint = 0;
+
 int main( int argc, char* argv[] ) {
 
 
@@ -36,6 +38,7 @@ int main( int argc, char* argv[] ) {
 
 	/* main process loop */
 	char* request;
+	signal(SIGINT,sig_int_handler);
 	while((request=readline(prompt))) {
 
 		if( !strcmp(request, "exit") || !strcmp(request,"quit")) 
@@ -67,6 +70,11 @@ void sig_child_handler( int s ) {
 	child_dead = 1;
 }
 
+void sig_int_handler( int s ) {
+	printf("\n");
+	caught_sigint = 1;
+	signal(SIGINT,sig_int_handler);
+}
 
 int load_history() {
 
@@ -328,8 +336,16 @@ int send_request( char* server,
 	double start = get_timestamp_millis();
 	int req_id = osrf_app_session_make_request( session, params, method, 1 );
 
+	if( caught_sigint ) 
+		caught_sigint = 0;
+
 	osrf_message* omsg = osrf_app_session_request_recv( session, req_id, 8 );
 
+	if( caught_sigint ) {
+		caught_sigint = 0;
+		return 1;
+	}
+
 	if(!omsg) 
 		printf("\nReceived no data from server\n");
 	
@@ -374,7 +390,15 @@ int send_request( char* server,
 			buffer_add( resp_buffer, code );
 		}
 
+		if( caught_sigint ) 
+			caught_sigint = 0;
+
 		omsg = osrf_app_session_request_recv( session, req_id, 5 );
+
+		if( caught_sigint ) {
+			caught_sigint = 0;
+			return 1;
+		}
 	}
 
 
@@ -640,7 +664,17 @@ int do_math( int count, int style ) {
 
 			ftime(&t1);
 			int req_id = osrf_app_session_make_request( session, params, methods[j], 1 );
+
+			if( caught_sigint ) 
+				caught_sigint = 0;
+
 			osrf_message* omsg = osrf_app_session_request_recv( session, req_id, 5 );
+
+			if( caught_sigint )  {
+				caught_sigint = 0;
+				return 1;
+			}
+
 			ftime(&t2);
 
 			double start	= ( (int)t1.time	+ ( ((float)t1.millitm) / 1000 ) );
@@ -651,13 +685,10 @@ int do_math( int count, int style ) {
 			if(omsg) {
 	
 				if(omsg->result_content) {
-					//char* jsn = json_object_to_json_string(omsg->result_content);
 					char* jsn = json_object_get_string( omsg->result_content );
-					//if(jsn == answers[j])
 					if(!strcmp(jsn, answers[j]))
 						fprintf(stderr, "+");
 					else
-						//fprintf(stderr, "|");
 						fprintf(stderr, "\n![%s] - should be %s\n", jsn, answers[j] );
 				}
 
diff --git a/OpenSRF/src/srfsh/srfsh.h b/OpenSRF/src/srfsh/srfsh.h
index 435dee12b3..37af2f8907 100644
--- a/OpenSRF/src/srfsh/srfsh.h
+++ b/OpenSRF/src/srfsh/srfsh.h
@@ -55,6 +55,7 @@ int print_help();
 char* json_printer( json* object );
 char* tabs(int count);
 void sig_child_handler( int s );
+void sig_int_handler( int s );
 
 int load_history();
 int handle_math( char* words[] );
-- 
2.43.2