=================================================================== RCS file: /home/cvs/OpenXM/src/kan96xx/plugin/oxmisc.c,v retrieving revision 1.26 retrieving revision 1.30 diff -u -p -r1.26 -r1.30 --- OpenXM/src/kan96xx/plugin/oxmisc.c 2006/05/06 10:53:36 1.26 +++ OpenXM/src/kan96xx/plugin/oxmisc.c 2016/03/31 03:22:55 1.30 @@ -1,4 +1,4 @@ -/* $OpenXM: OpenXM/src/kan96xx/plugin/oxmisc.c,v 1.25 2005/07/03 11:08:54 ohara Exp $ */ +/* $OpenXM: OpenXM/src/kan96xx/plugin/oxmisc.c,v 1.29 2015/10/08 11:49:37 takayama Exp $ */ #include #include #include @@ -23,7 +23,9 @@ FILE *MyErrorOut = NULL; #include "../Kan/extern.h" #include "ox_kan.h" +#include "mysig.h" + #define READBUFSIZE 5000 int OxVersion = 200012030; @@ -180,7 +182,7 @@ int oxWaitSyncBall(ox_stream ostream) /* or stdout */ fflush(NULL); if (mtag == -1) { - fprintf(stderr,"Your peer seems to be dead.\n"); return; + fprintf(stderr,"Your peer seems to be dead.\n"); return 0; } } } @@ -921,12 +923,12 @@ static void cancelConnection() { #else extern jmp_buf MyEnv_oxmisc; #endif - signal(SIGALRM,SIG_IGN); + mysignal(SIGALRM,SIG_IGN); fprintf(stderr,"Time out in TCP/IP connection.\n"); #if defined(__CYGWIN__) - siglongjmp(MyEnv_oxmisc,1); + MYSIGLONGJMP(MyEnv_oxmisc,1); #else - longjmp(MyEnv_oxmisc,1); + MYLONGJMP(MyEnv_oxmisc,1); #endif } @@ -950,15 +952,15 @@ oxclientp oxCreateClient2(int fdstream,int portStream, v = !Quiet; #if defined(__CYGWIN__) - if (sigsetjmp(MyEnv_oxmisc,1)) { + if (MYSIGSETJMP(MyEnv_oxmisc,1)) { #else - if (setjmp(MyEnv_oxmisc)) { + if (MYSETJMP(MyEnv_oxmisc)) { #endif return(NULL); }else{ } alarm((unsigned int) 20); /* setup timeout. */ - signal(SIGALRM,cancelConnection); + mysignal(SIGALRM,cancelConnection); switch(ipmask) { case 0:/* only local */ @@ -1000,7 +1002,7 @@ oxclientp oxCreateClient2(int fdstream,int portStream, return(NULL); } } - signal(SIGALRM,SIG_IGN); + mysignal(SIGALRM,SIG_IGN); controlByteOrder = oxSetByteOrder(fdControl); if (v) fprintf(stderr,"Byte order for control process is %s.\n",