===================================================================
RCS file: /home/cvs/OpenXM/src/k097/ox_k0.c,v
retrieving revision 1.4
retrieving revision 1.8
diff -u -p -r1.4 -r1.8
--- OpenXM/src/k097/ox_k0.c	2003/11/19 00:11:02	1.4
+++ OpenXM/src/k097/ox_k0.c	2013/11/06 06:23:23	1.8
@@ -1,4 +1,4 @@
-/* $OpenXM: OpenXM/src/k097/ox_k0.c,v 1.3 2003/11/18 11:08:27 takayama Exp $ */
+/* $OpenXM: OpenXM/src/k097/ox_k0.c,v 1.7 2004/09/17 02:42:58 takayama Exp $ */
 #include <stdio.h>
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -18,6 +18,7 @@ int PacketMonitor = 0;
 extern int SerialOX;  /* Serial number of the packets sent. */
 extern int SerialCurrent;  /* Current Serial number of the recieved packet. */
 extern int OXprintMessage; /* print oxmessages? */
+extern int Calling_ctrlC_hook;
 
 #if defined(__CYGWIN__)
 sigjmp_buf EnvOfChildServer;
@@ -68,6 +69,7 @@ nullserver(int fdStreamIn,int fdStreamOut) {
   ox_stream ostreamIn;
   ox_stream ostreamOut;
   char sreason[1024];
+  extern int RestrictedMode, RestrictedMode_saved;
   extern void controlResetHandler();
 #if defined(__CYGWIN__)
   extern sigjmp_buf EnvOfStackMachine;
@@ -75,6 +77,7 @@ nullserver(int fdStreamIn,int fdStreamOut) {
   extern jmp_buf EnvOfStackMachine;
 #endif
   int engineByteOrder;
+  extern int InSendmsg2;
 
   fflush(NULL);
   engineByteOrder = oxTellMyByteOrder(fdStreamOut,fdStreamIn);
@@ -117,8 +120,14 @@ nullserver(int fdStreamIn,int fdStreamOut) {
     if (OxInterruptFlag == 0) {
       fprintf(stderr," ?! \n"); fflush(NULL);
     }
-	KSexecuteString(" ctrlC-hook "); /* Execute User Defined functions. */
+    if (!Calling_ctrlC_hook) {
+      Calling_ctrlC_hook = 1; RestrictedMode = 0;
+      KSexecuteString(" ctrlC-hook "); /* Execute User Defined functions. */
+      RestrictedMode = RestrictedMode_saved;
+    }
+    Calling_ctrlC_hook = 0;
 	KSexecuteString(" (Computation is interrupted.) ");
+	InSendmsg2 = 0;
     signal(SIGUSR1,controlResetHandler); goto aaa;
   } else {  
     if (JmpMessage) fprintf(stderr,"Set EnvOfChildServer.\n");
@@ -150,7 +159,13 @@ nullserver(int fdStreamIn,int fdStreamOut) {
     */
     Sm1_pushError2(SerialCurrent,-1,"Global jump by sm1 error");
 
-	KSexecuteString(" ctrlC-hook "); /* Execute User Defined functions. */
+    if (!Calling_ctrlC_hook) {
+      Calling_ctrlC_hook = 1; RestrictedMode = 0;
+	  KSexecuteString(" ctrlC-hook "); /* Execute User Defined functions. */
+      RestrictedMode = RestrictedMode_saved;
+    }
+    Calling_ctrlC_hook = 0;
+    InSendmsg2=0;
     signal(SIGUSR1,controlResetHandler); goto aaa ;
   } else {
     if (JmpMessage) fprintf(stderr,"Set EnvOfStackMachine.\n"); 
@@ -327,7 +342,7 @@ nullserver_simplest(int fd) {
   int c;
   while(1) {
     c = readOneByte(fd);
-    if (c == '@') { return; }
+    if (c == '@') { return 0; }
   }
 }
 
@@ -342,6 +357,7 @@ void controlResetHandler(sig)
   if (OxCritical) {
     return;
   }else{
+    (void) traceShowStack(); traceClearStack();
 #if defined(__CYGWIN__)
     siglongjmp(EnvOfChildServer,2); /* returns 2 for ctrl-C */
 #else