===================================================================
RCS file: /home/cvs/OpenXM/src/k097/ox_k0.c,v
retrieving revision 1.7
retrieving revision 1.12
diff -u -p -r1.7 -r1.12
--- OpenXM/src/k097/ox_k0.c	2004/09/17 02:42:58	1.7
+++ OpenXM/src/k097/ox_k0.c	2020/10/07 23:53:25	1.12
@@ -1,4 +1,4 @@
-/* $OpenXM: OpenXM/src/k097/ox_k0.c,v 1.6 2004/09/05 00:51:18 takayama Exp $ */
+/* $OpenXM: OpenXM/src/k097/ox_k0.c,v 1.11 2016/03/31 05:27:34 takayama Exp $ */
 #include <stdio.h>
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -7,10 +7,15 @@
 #include <netdb.h>
 #include <signal.h>
 #include <setjmp.h>
+#include <string.h>
+#include <stdlib.h>
 /* -lnsl -lsocket /usr/ucblib/libucb.a */
 #include "../kxx/ox_kan.h"
 #include "../kxx/serversm.h"
+#include "ox_k0.h"
+#include "ki.h"
 
+
 int OxCritical = 0;
 int OxInterruptFlag = 0;
 int PacketMonitor = 0;
@@ -29,7 +34,7 @@ jmp_buf EnvOfChildServer;
 int JmpMessage = 0;
 
 static char *getSuffix(char *s);
-main(int argc, char *argv[]) {
+void main(int argc, char *argv[]) {
   char *s;
 
   if (argc > 1) {
@@ -63,7 +68,7 @@ static char *getSuffix(char *s) {
   }
   return(s);
 }
-nullserver(int fdStreamIn,int fdStreamOut) {
+void nullserver(int fdStreamIn,int fdStreamOut) {
   int mtag;
   int message = 1;
   ox_stream ostreamIn;
@@ -128,10 +133,10 @@ nullserver(int fdStreamIn,int fdStreamOut) {
     Calling_ctrlC_hook = 0;
 	KSexecuteString(" (Computation is interrupted.) ");
 	InSendmsg2 = 0;
-    signal(SIGUSR1,controlResetHandler); goto aaa;
+    mysignal(SIGUSR1,controlResetHandler); goto aaa;
   } else {  
     if (JmpMessage) fprintf(stderr,"Set EnvOfChildServer.\n");
-    signal(SIGUSR1,controlResetHandler);
+    mysignal(SIGUSR1,controlResetHandler);
   }
 #if defined(__CYGWIN__)
   if (sigsetjmp(EnvOfStackMachine,1)) {
@@ -166,11 +171,11 @@ nullserver(int fdStreamIn,int fdStreamOut) {
     }
     Calling_ctrlC_hook = 0;
     InSendmsg2=0;
-    signal(SIGUSR1,controlResetHandler); goto aaa ;
+    mysignal(SIGUSR1,controlResetHandler); goto aaa ;
   } else {
     if (JmpMessage) fprintf(stderr,"Set EnvOfStackMachine.\n"); 
-    if (signal(SIGUSR1,SIG_IGN) != SIG_IGN) {
-      signal(SIGUSR1,controlResetHandler);
+    if (mysignal(SIGUSR1,SIG_IGN) != SIG_IGN) {
+      mysignal(SIGUSR1,controlResetHandler);
     }
   }
   
@@ -230,7 +235,7 @@ nullserver(int fdStreamIn,int fdStreamOut) {
   }
 }
 
-nullserverCommand(ox_stream ostreamIn,ox_stream ostreamOut) {
+int nullserverCommand(ox_stream ostreamIn,ox_stream ostreamOut) {
   int id;
   int mtag;
   int n;
@@ -290,7 +295,7 @@ nullserverCommand(ox_stream ostreamIn,ox_stream ostrea
     if (message) fprintf(stderr," executeStringByLocalParser\n");
     OxCritical = 0;
     iresult = K0_executeStringByLocalParser();
-    OxCritical = 1; signal(SIGUSR1,controlResetHandler);
+    OxCritical = 1; mysignal(SIGUSR1,controlResetHandler);
     if (iresult < 0) {
       emsg = Sm1_popErrorMessage("executeString: ");
       Sm1_pushError2(SerialCurrent,-1,emsg);
@@ -301,7 +306,7 @@ nullserverCommand(ox_stream ostreamIn,ox_stream ostrea
     if (message) fprintf(stderr," executeFunction\n");
     OxCritical = 0;
     iresult = K0_executeStringByLocalParser();
-    OxCritical = 1; signal(SIGUSR1,controlResetHandler);
+    OxCritical = 1; mysignal(SIGUSR1,controlResetHandler);
     if (iresult < 0) {
       emsg = Sm1_popErrorMessage("executeFunction: ");
       Sm1_pushError2(SerialCurrent,-1,emsg);
@@ -309,13 +314,13 @@ nullserverCommand(ox_stream ostreamIn,ox_stream ostrea
     }
     break;
   case SM_popCMO:
-    if (message) fprintf(stderr,"popCMO.  Start to sending data.\n",n);
+    if (message) fprintf(stderr,"popCMO.  Start to sending data %d\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);
+    if (message) fprintf(stderr,"popString. send data from the stack %d\n",n);
     oxSendOXheader(ostreamOut,OX_DATA,SerialOX++);
     oxSendCmoString(ostreamOut,Sm1_popString());
     if (message) fprintf(stderr,"Done.\n");
@@ -338,11 +343,11 @@ nullserverCommand(ox_stream ostreamIn,ox_stream ostrea
 }
 
       
-nullserver_simplest(int fd) {
+int nullserver_simplest(int fd) {
   int c;
   while(1) {
     c = readOneByte(fd);
-    if (c == '@') { return; }
+    if (c == '@') { return 0; }
   }
 }
 
@@ -350,7 +355,7 @@ nullserver_simplest(int fd) {
 void controlResetHandler(sig)
      int sig;
 {
-  signal(sig,SIG_IGN);
+  mysignal(sig,SIG_IGN);
   cancelAlarm();
   fprintf(stderr,"From controlResetHandler. OxCritical = %d\n",OxCritical);
   OxInterruptFlag = 1;
@@ -381,7 +386,7 @@ extern int K00_verbose;
 int Startupk2 = 1;
 
 
-K0_start() {
+void K0_start() {
   extern int Saki;
   extern int Interactive;
   int i;
@@ -443,7 +448,7 @@ K0_start() {
   KSstop();  closing 
 */
 
-K0_executeStringByLocalParser() {
+int K0_executeStringByLocalParser() {
   extern int Interactive;
   char *s;
   s = Sm1_popString();