===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/io/sio.c,v
retrieving revision 1.12
retrieving revision 1.27
diff -u -p -r1.12 -r1.27
--- OpenXM_contrib2/asir2000/io/sio.c	2001/10/09 01:36:21	1.12
+++ OpenXM_contrib2/asir2000/io/sio.c	2015/08/14 13:51:55	1.27
@@ -44,12 +44,12 @@
  * OF THE SOFTWARE HAS BEEN DEVELOPED BY A THIRD PARTY, THE THIRD PARTY
  * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE,
  * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE.
- * $OpenXM: OpenXM_contrib2/asir2000/io/sio.c,v 1.11 2000/12/05 01:24:55 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/io/sio.c,v 1.26 2015/08/06 10:01:52 fujimoto Exp $ 
 */
 #include "ca.h"
-#include "setjmp.h"
+#include <setjmp.h>
 #include "ox.h"
-#if defined(VISUAL)
+#if defined(VISUAL) || defined(__MINGW32__)
 #include <winsock2.h>
 #include <io.h>
 #else
@@ -76,6 +76,10 @@ struct IOFP iofp[MAXIOFP];
 
 void init_socket(void);
 
+#if !defined(VISUAL) && !defined(__MINGW32__)
+#define closesocket(s)   (close((s)))
+#endif
+
 int getremotesocket(int s)
 {
 	return iofp[s].s;
@@ -103,7 +107,7 @@ void generate_port(int use_unix,char *port_str)
 	unsigned int port;
 	static int count=0;
 
-#if !defined(VISUAL)
+#if !defined(VISUAL) && !defined(__MINGW32__)
 	if ( use_unix ) {
 		sprintf(port_str,"/tmp/ox%02x.XXXXXX",count);
 		count++;
@@ -123,7 +127,7 @@ int try_bind_listen(int use_unix,char *port_str)
 	struct sockaddr *saddr;
 	int len;
 	int service;
-#if !defined(VISUAL)
+#if !defined(VISUAL) && !defined(__MINGW32__)
 	struct sockaddr_un s_un;
 
 	if ( use_unix ) {
@@ -156,17 +160,17 @@ int try_bind_listen(int use_unix,char *port_str)
 	}
 	if (bind(service, saddr, len) < 0) {
 		perror("in bind");
-		close(service);
+		closesocket(service);
 		return -1;
 	}
 	if (getsockname(service,saddr, &len) < 0) {
 	    perror("in getsockname");
-	    close(service);
+	    closesocket(service);
 	    return -1;
 	}
 	if (listen(service, SOCKQUEUELENGTH) < 0) {
 		perror("in listen");
-		close(service);
+		closesocket(service);
 		return -1;
 	}
 	return service;
@@ -191,7 +195,7 @@ int try_accept(int af_unix,int s)
 	int len,c,i;
 	struct sockaddr_in sin;
 
-#if !defined(VISUAL)
+#if !defined(VISUAL) && !defined(__MINGW32__)
 	struct sockaddr_un s_un;
 	if ( af_unix ) {
 		len = sizeof(s_un);
@@ -207,7 +211,7 @@ int try_accept(int af_unix,int s)
 	}
 	if ( i == 10 )
 		c = -1;
-	close(s);
+	closesocket(s);
 	return c;
 }
 
@@ -217,12 +221,12 @@ int try_connect(int use_unix,char *host,char *port_str
 	struct sockaddr *saddr;
 	struct hostent *hp;
 	int len,s,i;
-#if !defined(VISUAL)
+#if !defined(VISUAL) && !defined(__MINGW32__)
 	struct sockaddr_un s_un;
 #endif
 
 	for ( i = 0; i < 10; i++ ) {
-#if !defined(VISUAL)
+#if !defined(VISUAL) && !defined(__MINGW32__)
 		if ( use_unix ) {
 			if ( (s = socket(AF_UNIX,SOCK_STREAM,0)) < 0 ) {
 				perror("socket");
@@ -241,6 +245,8 @@ int try_connect(int use_unix,char *host,char *port_str
 		} else 
 #endif /* VISUAL */
 		{
+			if ( !host )
+				host = "127.0.0.1";
 			if ( (s = socket(AF_INET,SOCK_STREAM,0)) < 0 ) {
 				perror("socket");
 				return -1;
@@ -261,8 +267,8 @@ int try_connect(int use_unix,char *host,char *port_str
 		if ( connect(s,saddr,len) >= 0 )
 			break;
 		else {
-			close(s);
-#if defined(VISUAL)
+			closesocket(s);
+#if defined(VISUAL) || defined(__MINGW32__)
 			Sleep(100);
 #else
 			usleep(100000);
@@ -311,22 +317,24 @@ void free_iofp(int s)
 	struct IOFP *r;
 
 	r = &iofp[s];
-	r->in = r->out = 0; r->s = 0;
-#if !defined(VISUAL)
-	if ( r->socket )
-		unlink(r->socket);
+#if defined(VISUAL) || defined(__MINGW32__)
+	if ( r->s ) closesocket(r->s);
+#elif !defined(MPI)
+	if ( r->in ) fclose(r->in);
+	if ( r->out ) fclose(r->out);
+	if ( r->socket ) unlink(r->socket);
 #endif
+	r->inbuf = r->outbuf = 0;
+	r->in = r->out = 0; r->s = 0;
 }
 
-#define LBUFSIZ BUFSIZ*10
-
 int get_iofp(int s1,char *af_sock,int is_server)
 {
 	int i;
 	unsigned char c,rc;
 	extern int mpi_myid;
 
-#if MPI
+#if defined(MPI)
 	iofp[s1].s = s1;
 	if ( mpi_myid == s1 ) {
 		iofp[s1].in = 0;
@@ -344,15 +352,17 @@ int get_iofp(int s1,char *af_sock,int is_server)
 		if ( !iofp[i].in )
 			break;
 	iofp[i].s = s1;
-#if defined(VISUAL)
+#if defined(VISUAL) || defined(__MINGW32__)
 	iofp[i].in = WSIO_open(s1,"r");
 	iofp[i].out = WSIO_open(s1,"w");
 #else
 	iofp[i].in = fdopen(s1,"r");
 	iofp[i].out = fdopen(s1,"w");
-	setbuffer(iofp[i].in,(char *)malloc(LBUFSIZ),LBUFSIZ);
-	setbuffer(iofp[i].out,(char *)malloc(LBUFSIZ),LBUFSIZ);
+#if !defined(__CYGWIN__)
+	setbuffer(iofp[i].in,iofp[i].inbuf = (char *)MALLOC_ATOMIC(LBUFSIZ),LBUFSIZ);
+	setbuffer(iofp[i].out,iofp[i].outbuf = (char *)MALLOC_ATOMIC(LBUFSIZ),LBUFSIZ);
 #endif
+#endif
 	if ( little_endian )
 		c = 1;
 	else
@@ -379,7 +389,7 @@ int get_iofp(int s1,char *af_sock,int is_server)
 #endif
 }
 
-#if defined(VISUAL)
+#if defined(VISUAL) || defined(__MINGW32__)
 void init_socket()
 {
 	static int socket_is_initialized;