===================================================================
RCS file: /home/cvs/OpenXM/src/kxx/oxserver00.c,v
retrieving revision 1.12
retrieving revision 1.19
diff -u -p -r1.12 -r1.19
--- OpenXM/src/kxx/oxserver00.c	2003/11/19 01:02:40	1.12
+++ OpenXM/src/kxx/oxserver00.c	2015/10/08 11:49:38	1.19
@@ -1,4 +1,4 @@
-/* $OpenXM: OpenXM/src/kxx/oxserver00.c,v 1.11 2003/11/18 11:08:27 takayama Exp $ */
+/* $OpenXM: OpenXM/src/kxx/oxserver00.c,v 1.18 2015/10/08 08:14:25 takayama Exp $ */
 /* nullserver01 */
 #include <stdio.h>
 #include <sys/types.h>
@@ -15,12 +15,15 @@
 int OxCritical = 0;
 int OxInterruptFlag = 0;
 int PacketMonitor = 0;
+int NoExecution = 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;
+extern int RestrictedMode, RestrictedMode_saved;
 
-#if defined(__CYGWIN__)
+#if defined(__CYGWIN__) || defined(__MSYS__)
 sigjmp_buf EnvOfChildServer;
 #else
 jmp_buf EnvOfChildServer;
@@ -47,6 +50,9 @@ main(int argc, char *argv[]) {
     }else if (strcmp(argv[1],"-lispLike")==0) {
       fprintf(stderr,"Output lispLike expression.\n");
       Lisplike = 1;
+    }else if (strcmp(argv[1],"-noexec")==0) {
+      fprintf(stderr,"I do not execute commands.\n");
+      NoExecution = 1;
     }else{
       fprintf(stderr,"Unknown option. Possible options are -monitor\n");
     }
@@ -93,7 +99,7 @@ nullserver(int fdStreamIn,int fdStreamOut) {
   ox_stream ostreamOut;
   char sreason[1024];
   extern void controlResetHandler();
-#if defined(__CYGWIN__)
+#if defined(__CYGWIN__) || defined(__MSYS__)
   extern sigjmp_buf EnvOfStackMachine;
 #else
   extern jmp_buf EnvOfStackMachine;
@@ -125,17 +131,25 @@ nullserver(int fdStreamIn,int fdStreamOut) {
     if (PacketMonitor) fp2watch(ostreamOut,stdout);
   }
 
+  fprintf(stderr,"Hello world.\n"); OXprintMessage = 1;
+  JmpMessage = 1;
+
   aaa : ;
 #if defined(__CYGWIN__)
-  if (sigsetjmp(EnvOfChildServer,1)) {
+  if (MYSIGSETJMP(EnvOfChildServer,1)) {
 #else
-  if (setjmp(EnvOfChildServer)) {
+  if (MYSETJMP(EnvOfChildServer)) {
 #endif
     fprintf(stderr,"childServerMain: jump here.\n");
     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.) ");
     signal(SIGUSR1,controlResetHandler); goto aaa;
   } else {  
@@ -143,9 +157,9 @@ nullserver(int fdStreamIn,int fdStreamOut) {
     signal(SIGUSR1,controlResetHandler);
   }
 #if defined(__CYGWIN__)
-  if (sigsetjmp(EnvOfStackMachine,1)) {
+  if (MYSIGSETJMP(EnvOfStackMachine,1)) {
 #else  
-  if (setjmp(EnvOfStackMachine)) {
+  if (MYSETJMP(EnvOfStackMachine)) {
 #endif
     fprintf(stderr,"childServerMain: jump here by EnvOfStackMachine or timeout.\n");
     if (OxInterruptFlag == 0) {
@@ -161,7 +175,12 @@ 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;
     signal(SIGUSR1,controlResetHandler); goto aaa ;
   } else {
     if (JmpMessage) fprintf(stderr,"Set EnvOfStackMachine.\n"); 
@@ -244,48 +263,43 @@ nullserverCommand(ox_stream ostreamIn,ox_stream ostrea
   if (message) {fprintf(stderr,"\nfunction_id is %d; %s\n",id,oxFIDtoStr(id));}
   switch( id ) {
   case SM_mathcap:
-    if (message) fprintf(stderr," mathcap\n");
     mathresult = (struct mathCap *)Sm1_mathcap();
     oxPushMathCap(mathresult);
     break;
   case SM_setMathCap:
-    if (message) fprintf(stderr," setMathCap\n");
     Sm1_setMathCap(ostreamOut);
     break;
   case SM_pops:
-    if (message) fprintf(stderr," pops \n");
     Sm1_pops();
     break;
   case SM_getsp:
-    if (message) fprintf(stderr," getsp \n");
     Sm1_getsp();
     break;
   case SM_dupErrors:
-    if (message) fprintf(stderr," dupErrors \n");
     Sm1_dupErrors();
     break;
   case SM_pushCMOtag:
-    if (message) fprintf(stderr," pushCMOtag \n");
     Sm1_pushCMOtag(SerialCurrent);
     break;
   case SM_setName:
-    if (message) fprintf(stderr," setName \n");
     iresult = Sm1_setName();
     if (iresult < 0) {
       Sm1_pushError2(SerialCurrent,-1,"setName");
     }
     break;
   case SM_evalName:
-    if (message) fprintf(stderr," evalName \n");
     iresult = Sm1_evalName();
     if (iresult < 0) {
       Sm1_pushError2(SerialCurrent,-1,"evalName");
     }
     break;
   case SM_executeStringByLocalParser:
-    if (message) fprintf(stderr," executeStringByLocalParser\n");
     OxCritical = 0;
-    iresult = Sm1_executeStringByLocalParser();
+	if (NoExecution) {
+	  iresult = 0;
+	}else{
+	  iresult = Sm1_executeStringByLocalParser();
+	}
     OxCritical = 1; signal(SIGUSR1,controlResetHandler);
     if (iresult < 0) {
       emsg = Sm1_popErrorMessage("executeString: ");
@@ -294,9 +308,12 @@ nullserverCommand(ox_stream ostreamIn,ox_stream ostrea
     }
     break;
   case SM_executeFunction:
-    if (message) fprintf(stderr," executeFunction\n");
     OxCritical = 0;
-    iresult = Sm1_executeStringByLocalParser();
+	if (NoExecution) {
+	  iresult = 0;
+	}else{
+	  iresult = Sm1_executeStringByLocalParser();
+	}
     OxCritical = 1; signal(SIGUSR1,controlResetHandler);
     if (iresult < 0) {
       emsg = Sm1_popErrorMessage("executeFunction: ");
@@ -304,14 +321,26 @@ nullserverCommand(ox_stream ostreamIn,ox_stream ostrea
       return(-1);
     }
     break;
+  case SM_executeFunctionWithOptionalArgument:
+    OxCritical = 0;
+	if (NoExecution) {
+	  iresult = 0;
+	}else{
+	  iresult = Sm1_executeStringByLocalParser();
+	}
+    OxCritical = 1; signal(SIGUSR1,controlResetHandler);
+    if (iresult < 0) {
+      emsg = Sm1_popErrorMessage("executeFunctionWithOptionalArgument: ");
+      Sm1_pushError2(SerialCurrent,-1,emsg);
+      return(-1);
+    }
+    break;
   case SM_popCMO:
-    if (message) fprintf(stderr,"popCMO.  Start to sending data.\n",n);
     oxSendOXheader(ostreamOut,OX_DATA,SerialOX++);
     n=Sm1_popCMO(ostreamOut,SerialCurrent);
     if (message) fprintf(stderr,"Done.\n"); 
     break;
   case SM_popString:
-    if (message) fprintf(stderr,"popString. send data from the stack.\n",n);
     oxSendOXheader(ostreamOut,OX_DATA,SerialOX++);
     oxSendCmoString(ostreamOut,Sm1_popString());
     if (message) fprintf(stderr,"Done.\n");
@@ -338,7 +367,7 @@ nullserver_simplest(int fd) {
   int c;
   while(1) {
     c = readOneByte(fd);
-    if (c == '@') { return; }
+    if (c == '@') { return 0; }
   }
 }
 
@@ -353,10 +382,11 @@ void controlResetHandler(sig)
   if (OxCritical) {
     return;
   }else{
-#if defined(__CYGWIN__)
-    siglongjmp(EnvOfChildServer,2); /* returns 2 for ctrl-C */
+    (void) traceShowStack(); traceClearStack();
+#if defined(__CYGWIN__) || defined(__MSYS__)
+    MYSIGLONGJMP(EnvOfChildServer,2); /* returns 2 for ctrl-C */
 #else
-    longjmp(EnvOfChildServer,2); /* returns 2 for ctrl-C */
+    LONGJMP(EnvOfChildServer,2); /* returns 2 for ctrl-C */
 #endif
   }
 }