===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/io/tcpf.c,v
retrieving revision 1.23
retrieving revision 1.25
diff -u -p -r1.23 -r1.25
--- OpenXM_contrib2/asir2000/io/tcpf.c	2000/12/16 07:12:01	1.23
+++ OpenXM_contrib2/asir2000/io/tcpf.c	2001/06/06 02:21:40	1.25
@@ -44,7 +44,7 @@
  * 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.22 2000/12/05 01:24:55 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/io/tcpf.c,v 1.24 2001/06/04 02:49:47 noro Exp $ 
 */
 #include "ca.h"
 #include "parse.h"
@@ -202,7 +202,7 @@ NODE arg;
 LIST *rp;
 {
 	int i,c;
-	Q sid;
+	Q s_id;
 	NODE t,n0,n;
 	LIST list,l;
 
@@ -211,8 +211,8 @@ LIST *rp;
 			if ( (m_c_tab[i].m>=0) || (m_c_tab[i].c>=0) ) {
 				c = m_c_tab[i].c;
 				ox_get_serverinfo(c,&list);
-				STOQ(i,sid);
-				t = mknode(2,sid,list);
+				STOQ(i,s_id);
+				t = mknode(2,s_id,list);
 				MKLIST(l,t);
 				NEXTNODE(n0,n);
 				BDY(n) = (pointer)l;
@@ -507,7 +507,7 @@ char *control_port_str,*server_port_str;
 	rsh = getenv("ASIR_RSH");
 	if ( !rsh )
 		rsh = use_ssh ? "ssh" : RSH;
-	if ( !use_unix && dname && strstr(rsh,"ssh") ) {
+	if ( !use_unix && strstr(rsh,"ssh") ) {
 		/*
 		 * if "ssh" is used to invoke a remote server,
 		 * we should not specify "-display".
@@ -563,17 +563,23 @@ char *control_port_str,*server_port_str;
 	} else {
 		if ( dname )
 			if ( use_ssh )
-			sprintf(cmd,
+				sprintf(cmd,
 "%s -f -n %s \"xterm -name %s -title ox_launch:%s -geometry 60x10 -e %s %s %s %s %s %s %s >&/dev/null\">/dev/null",
 				rsh,host,OX_XTERM,host,launcher,localhost,conn_str,
 				control_port_str,server_port_str,server,"1");
 			else
-			sprintf(cmd,
+				sprintf(cmd,
 "%s -n %s \"xterm -name %s -title ox_launch:%s -display %s -geometry 60x10 -e %s %s %s %s %s %s %s >&/dev/null&\">/dev/null",
 				rsh,host,OX_XTERM,host,dname,launcher,localhost,conn_str,
 				control_port_str,server_port_str,server,dname);
 		else
-			sprintf(cmd,
+			if ( use_ssh )
+				sprintf(cmd,
+"%s -f -n %s \"%s %s %s %s %s %s %s %s>&/dev/null&\">/dev/null",
+				rsh,host,launcher,localhost,conn_str,
+				control_port_str,server_port_str,server,"1","-nolog");
+			else
+				sprintf(cmd,
 "%s -n %s \"%s %s %s %s %s %s %s %s>&/dev/null&\">/dev/null",
 				rsh,host,launcher,localhost,conn_str,
 				control_port_str,server_port_str,server,dname0,"-nolog");