===================================================================
RCS file: /home/cvs/OpenXM/src/kan96xx/plugin/mytcpio.c,v
retrieving revision 1.14
retrieving revision 1.17
diff -u -p -r1.14 -r1.17
--- OpenXM/src/kan96xx/plugin/mytcpio.c	2004/02/28 13:39:42	1.14
+++ OpenXM/src/kan96xx/plugin/mytcpio.c	2020/10/06 11:33:47	1.17
@@ -1,5 +1,6 @@
-/*  $OpenXM: OpenXM/src/kan96xx/plugin/mytcpio.c,v 1.13 2004/02/25 23:14:35 takayama Exp $ */
+/*  $OpenXM: OpenXM/src/kan96xx/plugin/mytcpio.c,v 1.16 2005/07/03 11:08:54 ohara Exp $ */
 #include <stdio.h>
+#include <string.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/time.h>
@@ -7,6 +8,7 @@
 #include <netdb.h>
 #include <setjmp.h>
 #include <errno.h>
+#include <unistd.h>
 /* -lnsl -lsocket /usr/ucblib/libucb.a */
 #include "ox_kan.h"
 /* 
@@ -34,7 +36,7 @@ FILE *TcpioError = NULL;
 int OpenedSocket = 0;
 extern int Quiet;
 
-socketOpen(char *serverName,int portNumber) {
+int socketOpen(char *serverName,int portNumber) {
   static struct hostent *myhost;
   static struct sockaddr_in me;
   static int s_waiting;
@@ -84,12 +86,12 @@ socketOpen(char *serverName,int portNumber) {
 }
 
 
-socketAccept(int snum) {
+int socketAccept(int snum) {
   int s, news;
     
   SET_TCPIOERROR;
   s = snum;
-  if (!Quiet) fprintf(TcpioError,"Trying to accept... "); fflush(TcpioError);
+  if (!Quiet) {fprintf(TcpioError,"Trying to accept... "); fflush(TcpioError);}
   if ((news = accept(s,NULL,NULL)) < 0) {
     errorMsg1s("Error in accept. Retrying (socketAccept).");
     /* Code added for strange behavior on cygwin. */
@@ -98,7 +100,7 @@ socketAccept(int snum) {
       return (-1);
     }
   }
-  if (!Quiet) fprintf(TcpioError,"Accepted.\n"); fflush(TcpioError);
+  if (!Quiet) {fprintf(TcpioError,"Accepted.\n"); fflush(TcpioError);}
   if (close(s) < 0) {
     errorMsg1s("Error in closing the old socket.");
     return(-1);
@@ -106,7 +108,7 @@ socketAccept(int snum) {
   return(news);
 }
 
-socketAcceptLocal(int snum) {
+int socketAcceptLocal(int snum) {
   int s, news;
   struct sockaddr peer;
   int len;
@@ -114,7 +116,7 @@ socketAcceptLocal(int snum) {
 
   SET_TCPIOERROR;
   s = snum;
-  if (!Quiet) fprintf(TcpioError,"Trying to accept from localhost... "); fflush(TcpioError);
+  if (!Quiet) {fprintf(TcpioError,"Trying to accept from localhost... "); fflush(TcpioError);}
   len = sizeof(struct sockaddr);
   if ((news = accept(s,&peer,&len)) < 0) {
     errorMsg1s("Error in accept. Retrying");
@@ -131,7 +133,7 @@ socketAcceptLocal(int snum) {
   for (i=0; i<len; i++) {
     if (!Quiet) printf(" %x ",peer.sa_data[i]);
   }
-  printf("\n");
+  if (!Quiet) printf("\n");
   if (peer.sa_data[2] == 0x7f && peer.sa_data[3] == 0 &&
       peer.sa_data[4] == 0    && peer.sa_data[5] == 1) {
     if (!Quiet) fprintf(stderr,"Authentication: localhost is allowed to be accepted.\n");
@@ -142,7 +144,7 @@ socketAcceptLocal(int snum) {
     return(-1);
   }
 
-  if (!Quiet) fprintf(TcpioError,"Accepted.\n"); fflush(TcpioError);
+  if (!Quiet) {fprintf(TcpioError,"Accepted.\n"); fflush(TcpioError);}
   if (close(s) < 0) {
     errorMsg1s("Error in closing the old socket.");
     return(-1);
@@ -151,7 +153,7 @@ socketAcceptLocal(int snum) {
 }
 
 /* It does not close the socket for listening. */
-socketAcceptLocal2(int snum) {
+int socketAcceptLocal2(int snum) {
   int s, news;
   struct sockaddr peer;
   int len;
@@ -159,7 +161,7 @@ socketAcceptLocal2(int snum) {
 
   SET_TCPIOERROR;
   s = snum;
-  if (!Quiet) fprintf(TcpioError,"Trying to accept from localhost... "); fflush(TcpioError);
+  if (!Quiet) {fprintf(TcpioError,"Trying to accept from localhost... "); fflush(TcpioError);}
   len = sizeof(struct sockaddr);
   if ((news = accept(s,&peer,&len)) < 0) {
     errorMsg1s("Error in accept. Retrying (socketAcceptLocal2).");
@@ -176,7 +178,7 @@ socketAcceptLocal2(int snum) {
   for (i=0; i<len; i++) {
     if (!Quiet) printf(" %x ",peer.sa_data[i]);
   }
-  printf("\n");
+  if (!Quiet) printf("\n");
   if (peer.sa_data[2] == 0x7f && peer.sa_data[3] == 0 &&
       peer.sa_data[4] == 0    && peer.sa_data[5] == 1) {
     if (!Quiet) fprintf(stderr,"Authentication: localhost is allowed to be accepted.\n");
@@ -186,7 +188,7 @@ socketAcceptLocal2(int snum) {
     return(-1);
   }
 
-  if (!Quiet) fprintf(TcpioError,"Accepted.\n"); fflush(TcpioError);
+  if (!Quiet) {fprintf(TcpioError,"Accepted.\n"); fflush(TcpioError);}
   return(news);
 }
 
@@ -219,7 +221,7 @@ int oxSocketSelect0(int fd,int t) {
   else return(0);
 }
 
-oxSocketMultiSelect(int sid[],int size,int t,int result[])
+int oxSocketMultiSelect(int sid[],int size,int t,int result[])
 {
   int i,fd,p;
   fd_set readfds;
@@ -270,7 +272,7 @@ oxSocketMultiSelect(int sid[],int size,int t,int resul
 }
 
 
-socketConnect(char *serverName,int portNumber) {
+int socketConnect(char *serverName,int portNumber) {
   struct hostent *servhost;
   struct sockaddr_in server;
   int socketid;
@@ -293,7 +295,7 @@ socketConnect(char *serverName,int portNumber) {
   }
   /* on=1; setsockopt(socketid,SOL_SOCKET,SO_REUSEADDR,&on,sizeof(on));  */
   if (!Quiet) {
-    fprintf(TcpioError,"Trying to connect port %d, ip=%x\n",ntohs(server.sin_port),server.sin_addr);
+    fprintf(TcpioError,"Trying to connect port %d, ip=%lx\n",ntohs(server.sin_port),(long) server.sin_addr.s_addr);
   }
   if (connect(socketid,(struct sockaddr *)&server,sizeof(server)) == -1) {
     errorMsg1s("cannot connect");
@@ -303,7 +305,7 @@ socketConnect(char *serverName,int portNumber) {
   return(socketid);
 }
 
-socketConnectWithPass(char *servername,int port,char *pass)
+int socketConnectWithPass(char *servername,int port,char *pass)
 {
   int fd;
   int m;