===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/io/ox_launch.c,v
retrieving revision 1.11
retrieving revision 1.20
diff -u -p -r1.11 -r1.20
--- OpenXM_contrib2/asir2000/io/ox_launch.c	2000/12/16 07:12:01	1.11
+++ OpenXM_contrib2/asir2000/io/ox_launch.c	2004/06/15 09:04:41	1.20
@@ -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.10 2000/11/08 06:21:17 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/io/ox_launch.c,v 1.19 2004/03/18 01:59:41 noro Exp $ 
 */
 #include <setjmp.h>
 #include <signal.h>
@@ -74,14 +74,13 @@ HANDLE hIntr,hReset,hKill;
 #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 void launch_error(char *);
-static int ox_io_init(int);
+static void ox_io_init(int);
 static void push_one(Obj);
 static Obj pop_one();
 static void do_cmd(int);
+static void terminate_server();
 
 static Obj *asir_OperandStack;
 static int asir_OperandStackPtr;
@@ -102,44 +101,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
@@ -155,15 +116,19 @@ void launch_main(argc,argv)
 int argc;
 char **argv;
 {
-	int id;
-	Obj p,obj;
+#if !defined(VISUAL)
+	Obj p;
 	char *name;
 	char buf[BUFSIZ];
+#endif
+	int id;
+	Obj obj;
 	int cs,ss;
 	unsigned int cmd;
 	int use_unix,accept_client,nolog;
 	char *control_port_str,*server_port_str;
 	char *rhost,*server,*dname;
+	char *e,*s;
 
 	GC_init(); nglob_init();
 	gethostname(hostname,BUFSIZ);
@@ -181,10 +146,25 @@ char **argv;
 #endif
 
 	signal(SIGINT,SIG_IGN);
+#if defined(SIGHUP)
+	signal(SIGHUP,SIG_IGN);
+#endif
 #if defined(SIGUSR1)
 	signal(SIGUSR1,SIG_IGN);
 #endif
+#if defined(SIGTERM)
+	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);
@@ -222,10 +202,6 @@ static void do_cmd(cmd)
 int cmd;
 {
 	USINT t;
-	int id,cindex;
-	int bport,sport;
-	int bs,bs0;
-	STRING prog,dname;
 
 	switch ( cmd ) {
 		case SM_shutdown:
@@ -289,7 +265,7 @@ int nolog;
 	char *av[BUFSIZ];
 	char sock_id[BUFSIZ],ox_intr[BUFSIZ],ox_reset[BUFSIZ],ox_kill[BUFSIZ];
 	char AsirExe[BUFSIZ];
-	HANDLE hProc;
+	int hProc;
 	STRING rootdir;
 	int mypid;
 	int newbs;
@@ -329,16 +305,16 @@ int nolog;
 	char errcode;
 
 	pid = fork();
-	if ( pid )
+	if ( pid ) {
 		return pid;
-	else {
+	} else {
 		setpgid(0,getpid());
-		if ( dup2(bs,3) != 3 )
+		if ( bs != 3 && dup2(bs,3) != 3 )
 			exit(1);
-		if ( dup2(bs,4) != 4 )
+		if ( bs != 4 && dup2(bs,4) != 4 )
 			exit(1);
 		{
-#if defined(linux) || defined(__NeXT__) || defined(ultrix)
+#if defined(linux) || defined(__NeXT__) || defined(ultrix) || defined(__CYGWIN__)
 #include <sys/param.h>
 			close(0);
 			for ( i = 5; i < NOFILE; i++ )
@@ -353,7 +329,7 @@ int nolog;
 				close(i);
 #endif
 		}
-		if ( !strcmp(dname,"1" ) ) /* XXX: for ssh */
+		if ( !nolog && !strcmp(dname,"1" ) ) /* XXX: for ssh */
 			execl(prog,prog,0);
 		else if ( nolog || !strcmp(dname,"0") ) {
 			FILE *null;
@@ -361,7 +337,11 @@ int nolog;
 			null = fopen("/dev/null","wb");
 			dup2(fileno(null),1);
 			dup2(fileno(null),2);
-			if ( strcmp(dname,"0") )
+			if ( !strcmp(dname,"1") ) {
+				/* XXX */
+				putenv("DISPLAY=");
+				execl(prog,prog,0);
+			} else if ( strcmp(dname,"0") )
 				execl(prog,prog,"-display",dname,0);
 			else {
 				putenv("DISPLAY=");
@@ -383,7 +363,7 @@ char *s;
 	exit(0);
 }
 
-static int ox_io_init(sock)
+static void ox_io_init(sock)
 int sock;
 {
 	endian_init();
@@ -404,5 +384,13 @@ static Obj pop_one() {
 	if ( asir_OperandStackPtr >= 0 ) {
 		return asir_OperandStack[asir_OperandStackPtr--];
 	}
+}
+
+static void terminate_server(int sig)
+{
+#if defined(SIGKILL)
+	kill(cpid,SIGKILL);
+#endif
+	exit(0);
 }