===================================================================
RCS file: /home/cvs/OpenXM/src/kan96xx/plugin/oxmisc.c,v
retrieving revision 1.23
retrieving revision 1.30
diff -u -p -r1.23 -r1.30
--- OpenXM/src/kan96xx/plugin/oxmisc.c	2004/09/17 08:46:10	1.23
+++ OpenXM/src/kan96xx/plugin/oxmisc.c	2016/03/31 03:22:55	1.30
@@ -1,5 +1,6 @@
-/*  $OpenXM: OpenXM/src/kan96xx/plugin/oxmisc.c,v 1.22 2004/09/17 07:27:28 takayama Exp $ */
+/*  $OpenXM: OpenXM/src/kan96xx/plugin/oxmisc.c,v 1.29 2015/10/08 11:49:37 takayama Exp $ */
 #include <stdio.h>
+#include <string.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/socket.h>
@@ -22,7 +23,9 @@ FILE *MyErrorOut = NULL;
 #include "../Kan/extern.h"
 
 #include "ox_kan.h"
+#include "mysig.h"
 
+
 #define READBUFSIZE 5000
 
 int OxVersion = 200012030;
@@ -178,6 +181,9 @@ int oxWaitSyncBall(ox_stream ostream)
     fprintf(stderr,"Looking for the next message tag. mtag=%d\n",mtag);
     /* or stdout */
     fflush(NULL);
+	if (mtag == -1) {
+	  fprintf(stderr,"Your peer seems to be dead.\n"); return 0;
+	}
   }
 }
 
@@ -344,7 +350,7 @@ void oxSendResultOfControl(int fd) 
 void oxSendMathCap(ox_stream os,struct mathCap *mathcap)
 {
   int i,n,infosize,ncmo;
-  struct object mathinfo;
+  struct object mathinfo = OINIT;
   /* printf("ox sending mathcap\n"); fflush(stdout); */
   mathinfo = *((struct object *)(mathcap->infop));
   infosize = getoaSize(mathinfo);
@@ -917,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
 }
 
@@ -946,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 */
@@ -996,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",