===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/io/tcpf.c,v
retrieving revision 1.28
retrieving revision 1.32
diff -u -p -r1.28 -r1.32
--- OpenXM_contrib2/asir2000/io/tcpf.c	2001/12/25 05:28:39	1.28
+++ OpenXM_contrib2/asir2000/io/tcpf.c	2002/07/29 05:02:45	1.32
@@ -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.27 2001/12/25 02:39:05 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/io/tcpf.c,v 1.31 2002/04/01 08:20:26 noro Exp $ 
 */
 #include "ca.h"
 #include "parse.h"
@@ -471,6 +471,15 @@ void ox_launch_generic(char *host,char *launcher,char 
 }
 
 #if defined(__CYGWIN__)
+static void bslash2slash(char *buf)
+{
+	char *p;
+
+	for ( p = buf; *p; p++ )
+		if ( *p == '\\' )
+			*p = '/';
+}
+
 static int get_start_path(char *buf)
 {
 	static char start_path[BUFSIZ];
@@ -482,22 +491,46 @@ static int get_start_path(char *buf)
 		return 1;
 	}
 
+	/* Windows98 */
+	strcpy(buf,"c:\\windows\\command\\start.exe");
+	cygwin_conv_to_full_posix_path(buf,name);
+	if ( !access(name,X_OK) ) {
+		bslash2slash(buf);
+		strcpy(start_path,buf);
+		start_initialized  = 1;
+		return 1;
+	}
+
 	/* Windows2000 */
 	strcpy(buf,"c:\\winnt\\system32\\start.exe");
 	cygwin_conv_to_full_posix_path(buf,name);
 	if ( !access(name,X_OK) ) {
+		bslash2slash(buf);
 		strcpy(start_path,buf);
+		start_initialized  = 1;
 		return 1;
 	}
 
-	/* Windows98 */
-	strcpy(buf,"c:\\windows\\command\\start.exe");
+	strcpy(buf,"c:\\winnt\\system32\\cmd.exe");
 	cygwin_conv_to_full_posix_path(buf,name);
 	if ( !access(name,X_OK) ) {
-		strcpy(start_path,buf);
+		bslash2slash(buf);
+		sprintf(start_path,"%s /c start",buf);
+		strcpy(buf,start_path);
+		start_initialized  = 1;
 		return 1;
 	}
 
+	strcpy(buf,"c:\\windows\\system32\\cmd.exe");
+	cygwin_conv_to_full_posix_path(buf,name);
+	if ( !access(name,X_OK) ) {
+		bslash2slash(buf);
+		sprintf(start_path,"%s /c start",buf);
+		strcpy(buf,start_path);
+		start_initialized  = 1;
+		return 1;
+	}
+
 	return 0;
 }
 
@@ -516,6 +549,7 @@ static void get_launcher_path(char *buf)
 	get_rootdir(rootname,sizeof(rootname));
 	sprintf(name,"%s/ox_launch.exe",rootname);
 	cygwin_conv_to_full_win32_path(name,launcher_path);		
+	bslash2slash(launcher_path);
 	launcher_initialized = 1;
 	strcpy(buf,launcher_path);
 }
@@ -526,7 +560,7 @@ void spawn_server(char *host,char *launcher,char *serv
 	char *control_port_str,char *server_port_str)
 {
 	char localhost[BUFSIZ];
-	char *dname,*conn_str,*rsh,*dname0;
+	char *dname,*conn_str,*rsh,*dname0,*asirhost;
 	char AsirExe[BUFSIZ];
 	STRING rootdir;
 	char prog[BUFSIZ];
@@ -554,7 +588,11 @@ void spawn_server(char *host,char *launcher,char *serv
 		 */
 		use_ssh = 1;
 	}
-	gethostname(localhost,BUFSIZ);
+	asirhost = (char *)getenv("ASIRHOSTNAME");
+	if ( asirhost )
+		strcpy(localhost,asirhost);
+	else
+		gethostname(localhost,BUFSIZ);
 #if defined(VISUAL)
 	if ( !use_unix )
 		error("spawn_server : not implemented on Windows");
@@ -575,28 +613,40 @@ void spawn_server(char *host,char *launcher,char *serv
 //	_spawnv(_P_NOWAIT,"d:\\home\\noro\\engine2000\\debug\\engine.exe",av);
 //	printf("ox_launch 127.0.0.1 %s %s %s %s 0\n",conn_str,control_port_str,server_port_str,server);
 #else
-	get_start_path(win_start);
 	if ( use_unix || !host ) {
-		if ( !fork() ) {
-			setpgid(0,getpid());
 #if defined(__CYGWIN__)
-			if ( dname && get_start_path(win_start) )
-			{
-				get_launcher_path(win_launcher);
-				execlp(win_start,"start",win_launcher,
-					use_unix?".":"127.1",conn_str,
-					control_port_str,server_port_str,server,"1",0);
+		get_launcher_path(win_launcher);
+		if ( dname && strchr(dname,':') ) {
+			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,
+					control_port_str,server_port_str,server,dname,0);
 			}
+		} else if ( dname && get_start_path(win_start) ) {
+  		sprintf(cmd,"%s %s %s %s %s %s %s 1",
+				win_start,win_launcher,use_unix?".":"127.1",conn_str,
+				control_port_str,server_port_str,server);	
+			system(cmd);
+		} else {
+			if ( !fork() ) {
+				setpgid(0,getpid());
+				execlp(launcher,launcher,use_unix?".":"127.1",conn_str,
+					control_port_str,server_port_str,server,dname0,"-nolog",0);
+			}
+		}
 #else
+		if ( !fork() ) {
+			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,
 					control_port_str,server_port_str,server,dname,0);
-#endif
 			else 
 				execlp(launcher,launcher,use_unix?".":"127.1",conn_str,
 					control_port_str,server_port_str,server,dname0,"-nolog",0);
 		}
+#endif
 	} else if ( conn_to_serv == 2 ) {
 		/* special support for java */
 		if ( dname )