allow signal handling by the GAP kernel to be disabled for embedding …

…in other applications

src/gap.c

@@ -436,7 +436,7 @@ int realmain( int argc, char * argv[] )
   SetupGAPLocation(argc, argv);
 
   /* initialize everything and read init.g which runs the GAP session */
-  InitializeGap( &argc, argv );
+  InitializeGap( &argc, argv, 1 );
   if (!STATE(UserHasQUIT)) {         /* maybe the user QUIT from the initial
                                    read of init.g  somehow*/
     /* maybe compile in which case init.g got skipped */
@@ -1698,10 +1698,11 @@ static Obj POST_RESTORE;
 
 void InitializeGap (
     int *               pargc,
-    char *              argv [] )
+    char *              argv [],
+    UInt                handleSignals )
 {
     /* initialize the basic system and gasman                              */
-    InitSystem( *pargc, argv );
+    InitSystem( *pargc, argv, handleSignals );
 
     /* Initialise memory  -- have to do this here to make sure we are at top of C stack */
     InitBags(SyStorMin,

src/gap.h

@@ -129,9 +129,9 @@ enum {
 
 /****************************************************************************
 **
-*F  InitializeGap( <argc>, <argv> ) . . . . . . . . . . . . . . . .  init GAP
+*F  InitializeGap( <argc>, <argv>, <handleSignals> )  . . . . . . .  init GAP
 */
-void InitializeGap(int * pargc, char * argv[]);
+void InitializeGap(int * pargc, char * argv[], UInt handleSignals);
 
 
 /****************************************************************************

src/libgap-api.c

@@ -36,9 +36,10 @@
 void GAP_Initialize(int              argc,
                     char **          argv,
                     GAP_CallbackFunc markBagsCallback,
-                    GAP_CallbackFunc errorCallback)
+                    GAP_CallbackFunc errorCallback,
+                    int              handleSignals)
 {
-    InitializeGap(&argc, argv);
+    InitializeGap(&argc, argv, handleSignals);
     SetExtraMarkFuncBags(markBagsCallback);
     STATE(JumpToCatchCallback) = errorCallback;
 

src/libgap-api.h

@@ -154,7 +154,8 @@ typedef void (*GAP_CallbackFunc)(void);
 void GAP_Initialize(int              argc,
                     char **          argv,
                     GAP_CallbackFunc markBagsCallback,
-                    GAP_CallbackFunc errorCallback);
+                    GAP_CallbackFunc errorCallback,
+                    int              handleSignals);
 
 
 ////

src/system.c

@@ -1041,7 +1041,8 @@ UInt SyOriginalArgc;
 
 void InitSystem (
     Int                 argc,
-    Char *              argv [] )
+    Char *              argv [],
+    UInt                handleSignals )
 {
     Char *              *ptrlist;
     UInt                i;             /* loop variable                   */
@@ -1098,7 +1099,9 @@ void InitSystem (
     rl_initialize ();
 #endif
 
-    SyInstallAnswerIntr();
+    if (handleSignals) {
+        SyInstallAnswerIntr();
+    }
 
 #if defined(SYS_DEFAULT_PATHS)
     SySetGapRootPath( SYS_DEFAULT_PATHS );

src/system.h

@@ -510,16 +510,16 @@ Int RegisterSyLongjmpObserver(voidfunc);
 
 /****************************************************************************
 **
-*F  InitSystem( <argc>, <argv> )  . . . . . . . . . initialize system package
+*F  InitSystem( <argc>, <argv>, <handleSignals> ) . initialize system package
 **
 **  'InitSystem' is called very early during the initialization from  'main'.
 **  It is passed the command line array  <argc>, <argv>  to look for options.
 **
 **  For UNIX it initializes the default files 'stdin', 'stdout' and 'stderr',
-**  installs the handler 'syAnswerIntr' to answer the user interrupts
-**  '<ctr>-C', scans the command line for options, sets up the GAP root paths,
-**  locates the '.gaprc' file (if any), and more.
+**  and if handleSignals is non-zero installs the handler 'syAnswerIntr' to
+**  answer the user interrupts '<ctr>-C', scans the command line for options,
+**  sets up the GAP root paths, locates the '.gaprc' file (if any), and more.
 */
-void InitSystem(Int argc, Char * argv[]);
+void InitSystem(Int argc, Char * argv[], UInt handleSignals);
 
 #endif // GAP_SYSTEM_H

tst/testlibgap/basic.c

@@ -5,7 +5,7 @@
 int main(int argc, char ** argv)
 {
     printf("# Initializing GAP...\n");
-    GAP_Initialize(argc, argv, 0, 0);
+    GAP_Initialize(argc, argv, 0, 0, 1);
     test_eval("1+2+3;");
     test_eval("g:=FreeGroup(2);");
     test_eval("a:=g.1;");

tst/testlibgap/wscreate.c

@@ -5,7 +5,7 @@
 #include "common.h"
 int main(int argc, char ** argv)
 {
-    GAP_Initialize(argc, argv, 0, 0);
+    GAP_Initialize(argc, argv, 0, 0, 1);
     test_eval("g:=FreeGroup(2);");
     test_eval("a:=g.1;");
     test_eval("b:=g.2;");

tst/testlibgap/wsload.c

@@ -12,7 +12,7 @@ int main(int argc, char ** argv)
     args[argc] = lpar;
     args[argc+1] = wsname;
     args[argc+2] = NULL;
-    GAP_Initialize(argc+2, args, 0, 0);
+    GAP_Initialize(argc+2, args, 0, 0, 1);
     printf("# looking at saved stuff...\n");
     test_eval("g;");
     test_eval("a;");