===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/io/ox_launch.c,v
retrieving revision 1.17
retrieving revision 1.25
diff -u -p -r1.17 -r1.25
--- OpenXM_contrib2/asir2000/io/ox_launch.c	2004/03/02 02:43:55	1.17
+++ OpenXM_contrib2/asir2000/io/ox_launch.c	2015/08/06 10:01:52	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/ox_launch.c,v 1.16 2001/12/25 02:39:05 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/io/ox_launch.c,v 1.24 2011/02/06 07:07:39 ohara Exp $ 
 */
 #include <setjmp.h>
 #include <signal.h>
@@ -52,7 +52,7 @@
 #include "ca.h"
 #include "com.h"
 #include "ox.h"
-#if defined(VISUAL)
+#if defined(VISUAL) || defined(__MINGW32__) || defined(__MINGW64__) || defined(__MINGW32__) || defined(__MINGW64__)
 #include <stdlib.h>
 #include <windows.h>
 #include <io.h>
@@ -69,14 +69,13 @@
 #include <unistd.h>
 #endif
 
-#if defined(VISUAL)
+#if defined(VISUAL) || defined(__MINGW32__) || defined(__MINGW64__)
 HANDLE hIntr,hReset,hKill;
+extern int _fileinfo;
 #endif
 
 static void put_log(char *);
-static int which_command(char *,char *);
-static int search_command(char *);
-static int ox_spawn(char *,int,char *,int);
+static int ox_spawn(char *,int,char *,char *);
 static void launch_error(char *);
 static void ox_io_init(int);
 static void push_one(Obj);
@@ -103,44 +102,6 @@ char *str;
 	fflush(logfile);
 }
 
-#if !defined(VISUAL)
-static int which_command(com,file)
-char *com,*file;
-{
-	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 ( search_command(path) ) {
-			strcpy(file,path); return 1;
-		}
-	}
-	file[0] = 0; return 0;
-}
-
-static int search_command(file)
-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
-
 /*  
 	argv[1] : host to connect
 	argv[2] : if 1, call try_bind_listen and try_accept
@@ -150,13 +111,14 @@ char *file;
 	argv[5] : server
 	argv[6] : display or "0"
 	argv[7] : if exists, it should be "-nolog"
+	XXX : argv[7] is used to pass the path of engine.exe in Windows.
 */
 
 void launch_main(argc,argv)
 int argc;
 char **argv;
 {
-#if !defined(VISUAL)
+#if !defined(VISUAL) && !defined(__MINGW32__) && !defined(__MINGW64__)
 	Obj p;
 	char *name;
 	char buf[BUFSIZ];
@@ -165,9 +127,10 @@ char **argv;
 	Obj obj;
 	int cs,ss;
 	unsigned int cmd;
-	int use_unix,accept_client,nolog;
+	int use_unix,accept_client;
 	char *control_port_str,*server_port_str;
-	char *rhost,*server,*dname;
+	char *rhost,*server,*dname,*nolog;
+	char *e,*s;
 
 	GC_init(); nglob_init();
 	gethostname(hostname,BUFSIZ);
@@ -178,14 +141,16 @@ char **argv;
 	server_port_str = argv[4];
 	server = argv[5];
 	dname = argv[6];
-	nolog = argc > 7 ? 1 : 0;
+	nolog = argc > 7 ? argv[7]: 0;
 
-#if defined(VISUAL)
+#if defined(VISUAL) || defined(__MINGW32__) || defined(__MINGW64__)
 		init_socket();
 #endif
 
 	signal(SIGINT,SIG_IGN);
+#if defined(SIGHUP)
 	signal(SIGHUP,SIG_IGN);
+#endif
 #if defined(SIGUSR1)
 	signal(SIGUSR1,SIG_IGN);
 #endif
@@ -193,6 +158,15 @@ char **argv;
 	signal(SIGTERM,terminate_server);
 #endif
 
+	/* XXX a dirty hack */
+	if ( !getenv("LD_LIBRARY_PATH") ) {
+		if ( e = getenv("OpenXM_HOME") ) {
+			s = (char *)alloca(strlen(e)+100);
+			sprintf(s,"LD_LIBRARY_PATH=%s/lib",e);
+			putenv(s);
+		}
+	}
+
 	if ( accept_client ) {
 		cs = try_bind_listen(use_unix,control_port_str);
 		ss = try_bind_listen(use_unix,server_port_str);
@@ -225,7 +199,7 @@ char **argv;
 	}
 }
 
-#if defined(VISUAL)
+#if defined(VISUAL) || defined(__MINGW32__) || defined(__MINGW64__)
 static void do_cmd(cmd)
 int cmd;
 {
@@ -287,9 +261,9 @@ static int ox_spawn(prog,bs,dname,nolog)
 char *prog;
 int bs;
 char *dname;
-int nolog;
+char *nolog;
 {
-#if defined(VISUAL)
+#if defined(VISUAL) || defined(__MINGW32__) || defined(__MINGW64__)
 	char *av[BUFSIZ];
 	char sock_id[BUFSIZ],ox_intr[BUFSIZ],ox_reset[BUFSIZ],ox_kill[BUFSIZ];
 	char AsirExe[BUFSIZ];
@@ -301,7 +275,7 @@ int nolog;
 	DuplicateHandle(GetCurrentProcess(),(HANDLE)bs,
 					GetCurrentProcess(),(HANDLE *)&newbs,
 					0,TRUE,DUPLICATE_SAME_ACCESS);
-	close(bs);
+	closesocket(bs);
 	bs = newbs;
 
 	mypid = GetCurrentProcessId();
@@ -319,9 +293,16 @@ int nolog;
 	av[4] = ox_reset;
 	av[5] = ox_kill;
 	av[6] = NULL;
-	Pget_rootdir(&rootdir);
-	sprintf(AsirExe,"%s\\bin\\engine.exe",BDY(rootdir));
+	if ( nolog ) {
+		sprintf(AsirExe,"\"%s\"",nolog);
+		strcpy(AsirExe,nolog);
+	} else {
+		Pget_rootdir(&rootdir);
+		sprintf(AsirExe,"%s\\bin\\engine.exe",BDY(rootdir));
+	}
+#if _MSC_VER < 1400
 	_fileinfo = 1;
+#endif
 	hProc = _spawnv(_P_NOWAIT,AsirExe,av);
 	return (int)hProc;
 #else /* VISUAL */
@@ -358,7 +339,7 @@ int nolog;
 #endif
 		}
 		if ( !nolog && !strcmp(dname,"1" ) ) /* XXX: for ssh */
-			execl(prog,prog,0);
+			execl(prog,prog,(char *)0);
 		else if ( nolog || !strcmp(dname,"0") ) {
 			FILE *null;
 
@@ -368,15 +349,15 @@ int nolog;
 			if ( !strcmp(dname,"1") ) {
 				/* XXX */
 				putenv("DISPLAY=");
-				execl(prog,prog,0);
+				execl(prog,prog,(char *)0);
 			} else if ( strcmp(dname,"0") )
-				execl(prog,prog,"-display",dname,0);
+				execl(prog,prog,"-display",dname,(char *)0);
 			else {
 				putenv("DISPLAY=");
-				execl(prog,prog,0);
+				execl(prog,prog,(char *)0);
 			}
 		} else
-			execl(prog,prog,"-display",dname,0);
+			execl(prog,prog,"-display",dname,(char *)0);
 		/* On failure */
 		errcode = 2;
 		write(4,&errcode,1);