===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/io/sio.c,v
retrieving revision 1.12
retrieving revision 1.21
diff -u -p -r1.12 -r1.21
--- OpenXM_contrib2/asir2000/io/sio.c	2001/10/09 01:36:21	1.12
+++ OpenXM_contrib2/asir2000/io/sio.c	2003/02/14 22:29:15	1.21
@@ -44,10 +44,10 @@
  * 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.20 2003/01/28 08:58:23 noro Exp $ 
 */
 #include "ca.h"
-#include "setjmp.h"
+#include <setjmp.h>
 #include "ox.h"
 #if defined(VISUAL)
 #include <winsock2.h>
@@ -241,6 +241,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;
@@ -311,22 +313,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)
+	if ( r->s ) close(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;
@@ -350,8 +354,10 @@ int get_iofp(int s1,char *af_sock,int is_server)
 #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 *)GC_malloc_atomic(LBUFSIZ),LBUFSIZ);
+	setbuffer(iofp[i].out,iofp[i].outbuf = (char *)GC_malloc_atomic(LBUFSIZ),LBUFSIZ);
+#endif
 #endif
 	if ( little_endian )
 		c = 1;