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

…in other applications
gap-system · Jan 7, 2019 · 99fe35c · 99fe35c
1 parent 823bd43
commit 99fe35c
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 15 deletions.
diff --git a/src/gap.c b/src/gap.c
@@ -441,7 +441,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 */
@@ -1717,10 +1717,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,

diff --git a/src/gap.h b/src/gap.h
@@ -119,11 +119,12 @@ enum {
 
 /****************************************************************************
 **
-*F  InitializeGap( <argc>, <argv> ) . . . . . . . . . . . . . . . .  init GAP
+*F  InitializeGap( <argc>, <argv>, <handleSignals> )  . . . . . . .  init GAP
 */
 extern void InitializeGap (
             int *               pargc,
-            char *              argv [] );
+            char *              argv [],
+            UInt                handleSignals );
 
 
 #endif // GAP_GAP_H
diff --git a/src/libgap-api.c b/src/libgap-api.c
@@ -32,9 +32,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;
 

diff --git a/src/libgap-api.h b/src/libgap-api.h
@@ -26,7 +26,8 @@ typedef void (*GAP_CallbackFunc)(void);
 extern void GAP_Initialize(int              argc,
                            char **          argv,
                            GAP_CallbackFunc markBagsCallback,
-                           GAP_CallbackFunc errorCallback);
+                           GAP_CallbackFunc errorCallback,
+                           int              handleSignals);
 
 
 ////

diff --git a/src/system.c b/src/system.c
@@ -1048,7 +1048,8 @@ UInt SyOriginalArgc;
 
 void InitSystem (
     Int                 argc,
-    Char *              argv [] )
+    Char *              argv [],
+    UInt                handleSignals )
 {
     Char *              *ptrlist;
     UInt                i;             /* loop variable                   */
@@ -1105,7 +1106,9 @@ void InitSystem (
     rl_initialize ();
 #endif
 
-    SyInstallAnswerIntr();
+    if (handleSignals) {
+        SyInstallAnswerIntr();
+    }
 
 #if defined(SYS_DEFAULT_PATHS)
     SySetGapRootPath( SYS_DEFAULT_PATHS );

diff --git a/src/system.h b/src/system.h
@@ -510,18 +510,19 @@ 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.
 */
 extern void InitSystem (
             Int                 argc,
-            Char *              argv [] );
+            Char *              argv [],
+            UInt                handleSignals );
 
 #endif // GAP_SYSTEM_H