===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/io/tcpf.c,v
retrieving revision 1.8
retrieving revision 1.12
diff -u -p -r1.8 -r1.12
--- OpenXM_contrib2/asir2000/io/tcpf.c	2000/07/13 05:09:03	1.8
+++ OpenXM_contrib2/asir2000/io/tcpf.c	2000/09/23 00:57:44	1.12
@@ -1,4 +1,51 @@
-/* $OpenXM: OpenXM_contrib2/asir2000/io/tcpf.c,v 1.7 2000/03/19 12:35:20 noro Exp $ */
+/*
+ * Copyright (c) 1994-2000 FUJITSU LABORATORIES LIMITED 
+ * All rights reserved.
+ * 
+ * FUJITSU LABORATORIES LIMITED ("FLL") hereby grants you a limited,
+ * non-exclusive and royalty-free license to use, copy, modify and
+ * redistribute, solely for non-commercial and non-profit purposes, the
+ * computer program, "Risa/Asir" ("SOFTWARE"), subject to the terms and
+ * conditions of this Agreement. For the avoidance of doubt, you acquire
+ * only a limited right to use the SOFTWARE hereunder, and FLL or any
+ * third party developer retains all rights, including but not limited to
+ * copyrights, in and to the SOFTWARE.
+ * 
+ * (1) FLL does not grant you a license in any way for commercial
+ * purposes. You may use the SOFTWARE only for non-commercial and
+ * non-profit purposes only, such as academic, research and internal
+ * business use.
+ * (2) The SOFTWARE is protected by the Copyright Law of Japan and
+ * international copyright treaties. If you make copies of the SOFTWARE,
+ * with or without modification, as permitted hereunder, you shall affix
+ * to all such copies of the SOFTWARE the above copyright notice.
+ * (3) An explicit reference to this SOFTWARE and its copyright owner
+ * shall be made on your publication or presentation in any form of the
+ * results obtained by use of the SOFTWARE.
+ * (4) In the event that you modify the SOFTWARE, you shall notify FLL by
+ * e-mail at risa-admin@sec.flab.fujitsu.co.jp of the detailed specification
+ * for such modification or the source code of the modified part of the
+ * SOFTWARE.
+ * 
+ * THE SOFTWARE IS PROVIDED AS IS WITHOUT ANY WARRANTY OF ANY KIND. FLL
+ * MAKES ABSOLUTELY NO WARRANTIES, EXPRESSED, IMPLIED OR STATUTORY, AND
+ * EXPRESSLY DISCLAIMS ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT OF THIRD PARTIES'
+ * RIGHTS. NO FLL DEALER, AGENT, EMPLOYEES IS AUTHORIZED TO MAKE ANY
+ * MODIFICATIONS, EXTENSIONS, OR ADDITIONS TO THIS WARRANTY.
+ * UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, TORT, CONTRACT,
+ * OR OTHERWISE, SHALL FLL BE LIABLE TO YOU OR ANY OTHER PERSON FOR ANY
+ * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+ * DAMAGES OF ANY CHARACTER, INCLUDING, WITHOUT LIMITATION, DAMAGES
+ * ARISING OUT OF OR RELATING TO THE SOFTWARE OR THIS AGREEMENT, DAMAGES
+ * FOR LOSS OF GOODWILL, WORK STOPPAGE, OR LOSS OF DATA, OR FOR ANY
+ * DAMAGES, EVEN IF FLL SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF
+ * SUCH DAMAGES, OR FOR ANY CLAIM BY ANY OTHER PARTY. EVEN IF A PART
+ * 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/tcpf.c,v 1.11 2000/08/22 05:04:18 noro Exp $ 
+*/
 #if INET
 #include "ca.h"
 #include "parse.h"
@@ -305,6 +352,13 @@ Q *rp;
 	/* client mode */
 	cn = get_iofp(cs,cport_str,0);
 	sn = get_iofp(ss,sport_str,0);
+	/* get_iofp returns -1 if the laucher could not spawn the server */
+	if ( sn < 0 ) {
+		/* we should terminate the launcher */
+		ox_send_cmd(cn,SM_shutdown); ox_flush_stream_force(cn);
+		STOQ(-1,*rp);
+		return;
+	}
 
 	/* register server to the server list */
 	ind = register_server(use_unix,cn,sn);
@@ -394,6 +448,13 @@ Q *rp;
 	/* client mode */
 	cn = get_iofp(cs,control_port_str,0);
 	sn = get_iofp(ss,server_port_str,0);
+	/* get_iofp returns -1 if the laucher could not spawn the server */
+	if ( sn < 0 ) {
+		/* we should terminate the launcher */
+		ox_send_cmd(cn,SM_shutdown); ox_flush_stream_force(cn);
+		STOQ(-1,*rp);
+		return;
+	}
 
 	/* register server to the server list */
 	ind = register_server(use_unix,cn,sn);
@@ -548,17 +609,18 @@ int af_unix,m,c;
 {
 	int s,i,ci;
 	struct m_c *t;
+#define INIT_TAB_SIZ 64
 
 	if ( c < 0 )
 		return -1;
 	if ( !m_c_tab ) {
-		s = BUFSIZ*sizeof(struct m_c);
+		s = INIT_TAB_SIZ*sizeof(struct m_c);
 		m_c_tab = (struct m_c *)MALLOC_ATOMIC(s);
-		for ( i = 0; i < BUFSIZ; i++ ) {
+		for ( i = 0; i < INIT_TAB_SIZ; i++ ) {
 			m_c_tab[i].af_unix = 0;
 			m_c_tab[i].m = m_c_tab[i].c = -1;
 		}
-		m_c_s = BUFSIZ;
+		m_c_s = INIT_TAB_SIZ;
 	}
 #if !MPI
 	for ( i = 0; i < m_c_i; i++ )
@@ -571,14 +633,14 @@ int af_unix,m,c;
 	}
 #endif
 	if ( m_c_i == m_c_s ) {
-		s = (m_c_s+BUFSIZ)*sizeof(struct m_c);
+		s = (m_c_s+INIT_TAB_SIZ)*sizeof(struct m_c);
 		t = (struct m_c *)MALLOC_ATOMIC(s); bzero(m_c_tab,s);
 		bcopy(m_c_tab,t,m_c_s*sizeof(struct m_c));
-		for ( i = 0; i < BUFSIZ; i++ ) {
+		for ( i = 0; i < INIT_TAB_SIZ; i++ ) {
 			m_c_tab[m_c_s+i].af_unix = 0;
 			m_c_tab[m_c_s+i].m = m_c_tab[m_c_s+i].c = -1;
 		}
-		m_c_s += BUFSIZ; m_c_tab = t;
+		m_c_s += INIT_TAB_SIZ; m_c_tab = t;
 	}
 	m_c_tab[m_c_i].m = m; m_c_tab[m_c_i].c = c;
 	m_c_tab[m_c_i].af_unix = af_unix;