=================================================================== RCS file: /home/cvs/OpenXM/src/kxx/oxserver00.c,v retrieving revision 1.22 retrieving revision 1.23 diff -u -p -r1.22 -r1.23 --- OpenXM/src/kxx/oxserver00.c 2015/10/10 11:29:46 1.22 +++ OpenXM/src/kxx/oxserver00.c 2016/03/31 05:27:34 1.23 @@ -1,4 +1,4 @@ -/* $OpenXM: OpenXM/src/kxx/oxserver00.c,v 1.21 2015/10/09 23:46:18 takayama Exp $ */ +/* $OpenXM: OpenXM/src/kxx/oxserver00.c,v 1.22 2015/10/10 11:29:46 takayama Exp $ */ /* nullserver01 */ #include #include @@ -152,10 +152,10 @@ nullserver(int fdStreamIn,int fdStreamOut) { } Calling_ctrlC_hook = 0; KSexecuteString(" (Computation is interrupted.) "); - 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 (MYSIGSETJMP(EnvOfStackMachine,1)) { @@ -182,11 +182,11 @@ nullserver(int fdStreamIn,int fdStreamOut) { RestrictedMode = RestrictedMode_saved; } Calling_ctrlC_hook = 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); } } @@ -301,7 +301,7 @@ nullserverCommand(ox_stream ostreamIn,ox_stream ostrea }else{ iresult = Sm1_executeStringByLocalParser(); } - OxCritical = 1; signal(SIGUSR1,controlResetHandler); + OxCritical = 1; mysignal(SIGUSR1,controlResetHandler); if (iresult < 0) { emsg = Sm1_popErrorMessage("executeString: "); Sm1_pushError2(SerialCurrent,-1,emsg); @@ -315,7 +315,7 @@ nullserverCommand(ox_stream ostreamIn,ox_stream ostrea }else{ iresult = Sm1_executeStringByLocalParser(); } - OxCritical = 1; signal(SIGUSR1,controlResetHandler); + OxCritical = 1; mysignal(SIGUSR1,controlResetHandler); if (iresult < 0) { emsg = Sm1_popErrorMessage("executeFunction: "); Sm1_pushError2(SerialCurrent,-1,emsg); @@ -329,7 +329,7 @@ nullserverCommand(ox_stream ostreamIn,ox_stream ostrea }else{ iresult = Sm1_executeStringByLocalParser(); } - OxCritical = 1; signal(SIGUSR1,controlResetHandler); + OxCritical = 1; mysignal(SIGUSR1,controlResetHandler); if (iresult < 0) { emsg = Sm1_popErrorMessage("executeFunctionWithOptionalArgument: "); Sm1_pushError2(SerialCurrent,-1,emsg); @@ -376,7 +376,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;