===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/io/tcpf.c,v
retrieving revision 1.49
retrieving revision 1.55
diff -u -p -r1.49 -r1.55
--- OpenXM_contrib2/asir2000/io/tcpf.c	2003/12/12 04:59:59	1.49
+++ OpenXM_contrib2/asir2000/io/tcpf.c	2004/06/15 09:04:41	1.55
@@ -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.48 2003/12/11 05:48:04 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/io/tcpf.c,v 1.54 2004/03/11 07:40:42 noro Exp $ 
 */
 #include "ca.h"
 #include "parse.h"
@@ -89,10 +89,10 @@ if((ind)<0||(ind)>=mpi_nprocs){error("invalid server i
 if((ind)<0||(ind)>=mpi_nprocs){(ind)=-1;}
 #else
 #define valid_mctab_index(ind)\
-if((ind)<0||(ind)>=m_c_i||\
+if((ind)<I_am_server||(ind)>=m_c_i||\
 ((m_c_tab[ind].m<0)&&(m_c_tab[ind].c<0))){error("invalid server id");}
 #define check_valid_mctab_index(ind)\
-if((ind)<0||(ind)>=m_c_i||\
+if((ind)<I_am_server||(ind)>=m_c_i||\
 ((m_c_tab[ind].m<0)&&(m_c_tab[ind].c<0))){(ind)=-1;}
 #endif
 
@@ -301,6 +301,7 @@ void Pox_reset_102(NODE arg,Q *rp)
 	s = m_c_tab[index].c;
 	ox_send_cmd(s,SM_reset_102);
 	ox_flush_stream_force(s);
+	*rp = 0;
 }
 
 void Pox_get_rank_102(LIST *rp)
@@ -489,6 +490,49 @@ void Pregister_server(NODE arg,Q *rp)
 	STOQ(ind,*rp);
 }
 
+#if !defined(VISUAL)
+#include <sys/file.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <pwd.h>
+
+static int find_executable(char *);
+static int find_executable_main(char *);
+
+static int find_executable(char *com)
+{
+	char *c,*s;
+	int len;
+	char dir[BUFSIZ],path[BUFSIZ];
+
+	for ( s = (char *)getenv("PATH"); s; ) {
+		c = (char *)index(s,':');
+		if ( c ) {
+			len = c-s;
+			strncpy(dir,s,len); s = c+1; dir[len] = 0;
+		} else {
+			strcpy(dir,s); s = 0;
+		}
+		sprintf(path,"%s/%s",dir,com);
+		if ( find_executable_main(path) )
+			return 1;
+	}
+	return 0;
+}
+
+static int find_executable_main(char *file)
+{
+	struct stat buf;
+
+	if ( stat(file,&buf) || (buf.st_mode & S_IFDIR) )
+		return 0;
+	if ( access(file,X_OK) )
+		return 0;
+	else
+		return 1;
+}
+
+#endif
 /*
   ox_launch_generic(host,launcher,server,use_unix,use_ssh,use_x,conn_to_serv)
 
@@ -531,6 +575,9 @@ void ox_launch_generic(char *host,char *launcher,char 
 	Obj obj;
 	MATHCAP server_mathcap;
 
+#if !defined(VISUAL)
+	if ( use_unix && !find_executable("xterm") ) use_x = 0;
+#endif
 	control_port_str[0] = 0;
 	server_port_str[0] = 0;
 	do { 
@@ -739,7 +786,7 @@ void spawn_server(char *host,char *launcher,char *serv
 			if ( !fork() ) {
 				setpgid(0,getpid());
 				execlp("xterm","xterm","-name",OX_XTERM,"-T","ox_launch:local","-display",dname,
-					"-geometry","60x10","-e",launcher,use_unix?".":"127.1",conn_str,
+					"-geometry","60x10","-xrm","XTerm*locale:false","-e",launcher,use_unix?".":"127.1",conn_str,
 					control_port_str,server_port_str,server,dname,0);
 			}
 		} else if ( dname && get_start_path(win_start) ) {
@@ -759,7 +806,7 @@ void spawn_server(char *host,char *launcher,char *serv
 			setpgid(0,getpid());
 			if ( dname )
 				execlp("xterm","xterm","-name",OX_XTERM,"-T","ox_launch:local","-display",dname,
-					"-geometry","60x10","-e",launcher,use_unix?".":"127.1",conn_str,
+					"-geometry","60x10","-xrm","XTerm*locale:false","-e",launcher,use_unix?".":"127.1",conn_str,
 					control_port_str,server_port_str,server,dname,0);
 			else 
 				execlp(launcher,launcher,use_unix?".":"127.1",conn_str,
@@ -784,12 +831,12 @@ void spawn_server(char *host,char *launcher,char *serv
 		if ( dname )
 			if ( use_ssh )
 				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",
+"%s -f -n %s \"xterm -name %s -title ox_launch:%s -geometry 60x10 -xrm 'XTerm*locale:false' -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,
-"%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",
+"%s -n %s \"xterm -name %s -title ox_launch:%s -display %s -geometry 60x10 -xrm 'XTerm*locale:false' -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
@@ -1236,6 +1283,7 @@ void Pox_execute_string(NODE arg,Obj *rp)
 	int s;
 	int index = QTOS((Q)ARG0(arg));
 
+	asir_assert(ARG1(arg),O_STR,"ox_execute_string");
 	valid_mctab_index(index);
 	s = m_c_tab[index].c;
 	ox_send_data(s,ARG1(arg));