=================================================================== RCS file: /home/cvs/OpenXM/src/kan96xx/plugin/mytcpio.c,v retrieving revision 1.3 retrieving revision 1.6 diff -u -p -r1.3 -r1.6 --- OpenXM/src/kan96xx/plugin/mytcpio.c 2000/03/20 01:53:47 1.3 +++ OpenXM/src/kan96xx/plugin/mytcpio.c 2002/02/24 10:27:20 1.6 @@ -1,4 +1,4 @@ -/* $OpenXM: OpenXM/src/kan96xx/plugin/mytcpio.c,v 1.2 1999/10/30 02:22:16 takayama Exp $ */ +/* $OpenXM: OpenXM/src/kan96xx/plugin/mytcpio.c,v 1.5 2001/05/04 01:06:30 takayama Exp $ */ #include #include #include @@ -15,8 +15,12 @@ #if defined(sun) int MyEnv_oxmisc[2000]; #else +#if defined(__CYGWIN__) +sigjmp_buf MyEnv_oxmisc; /* may cause a trouble in Solaris. */ +#else jmp_buf MyEnv_oxmisc; /* may cause a trouble in Solaris. */ #endif +#endif #define READBUFSIZE 10000 static void errorMsg1s(char *s) { @@ -38,7 +42,7 @@ socketOpen(char *serverName,int portNumber) { SET_TCPIOERROR; fprintf(TcpioError,"Hello from open. serverName is %s and portnumber is %d\n", - serverName,portNumber); + serverName,portNumber); if ((myhost = gethostbyname(serverName)) == NULL) { errorMsg1s("Bad server name."); return(-1); @@ -47,7 +51,7 @@ socketOpen(char *serverName,int portNumber) { me.sin_family = AF_INET; me.sin_port = htons(portNumber); bcopy(myhost->h_addr, - &me.sin_addr,myhost->h_length); + &me.sin_addr,myhost->h_length); if ((s_waiting = socket(AF_INET,SOCK_STREAM,0)) < 0) { errorMsg1s("Socket allocation is failed."); @@ -121,9 +125,9 @@ socketAcceptLocal(int snum) { printf("\n"); if (peer.sa_data[2] == 0x7f && peer.sa_data[3] == 0 && peer.sa_data[4] == 0 && peer.sa_data[5] == 1) { - fprintf(stderr,"Authentification: localhost is allowed to be accepted.\n"); + fprintf(stderr,"Authentication: localhost is allowed to be accepted.\n"); }else{ - errorMsg1s("Authentification: The connection is not from the localhost."); + errorMsg1s("Authentication: The connection is not from the localhost."); close(s); fprintf(stderr,"The connection is refused."); return(-1); @@ -234,7 +238,7 @@ socketConnect(char *serverName,int portNumber) { server.sin_family = AF_INET; server.sin_port = htons(portNumber); bcopy(servhost->h_addr, - (char *)&server.sin_addr,servhost->h_length); + (char *)&server.sin_addr,servhost->h_length); if ((socketid = socket(AF_INET,SOCK_STREAM,0)) <0) { errorMsg1s("socket allocation is failed.\n");