===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/io/ox_launch.c,v
retrieving revision 1.4
retrieving revision 1.13
diff -u -p -r1.4 -r1.13
--- OpenXM_contrib2/asir2000/io/ox_launch.c	2000/08/22 05:04:18	1.4
+++ OpenXM_contrib2/asir2000/io/ox_launch.c	2001/06/27 09:14:08	1.13
@@ -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.3 2000/08/21 08:31:38 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/io/ox_launch.c,v 1.12 2001/06/06 02:21:40 noro Exp $ 
 */
 #include <setjmp.h>
 #include <signal.h>
@@ -53,6 +53,7 @@
 #include "com.h"
 #include "ox.h"
 #if defined(VISUAL)
+#include <stdlib.h>
 #include <windows.h>
 #include <io.h>
 #include <fcntl.h>
@@ -75,12 +76,13 @@ HANDLE hIntr,hReset,hKill;
 static void put_log(char *);
 static int which_command(char *,char *);
 static int search_command(char *);
-static int ox_spawn(char *,int,char *);
+static int ox_spawn(char *,int,char *,int);
 static void launch_error(char *);
 static int 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;
@@ -147,6 +149,7 @@ char *file;
 	argv[4] : server_port 
 	argv[5] : server
 	argv[6] : display or "0"
+	argv[7] : if exists, it should be "-nolog"
 */
 
 void launch_main(argc,argv)
@@ -159,7 +162,7 @@ char **argv;
 	char buf[BUFSIZ];
 	int cs,ss;
 	unsigned int cmd;
-	int use_unix,accept_client;
+	int use_unix,accept_client,nolog;
 	char *control_port_str,*server_port_str;
 	char *rhost,*server,*dname;
 
@@ -172,6 +175,7 @@ char **argv;
 	server_port_str = argv[4];
 	server = argv[5];
 	dname = argv[6];
+	nolog = argc > 7 ? 1 : 0;
 
 #if defined(VISUAL)
 		init_socket();
@@ -181,6 +185,9 @@ char **argv;
 #if defined(SIGUSR1)
 	signal(SIGUSR1,SIG_IGN);
 #endif
+#if defined(SIGTERM)
+	signal(SIGTERM,terminate_server);
+#endif
 
 	if ( accept_client ) {
 		cs = try_bind_listen(use_unix,control_port_str);
@@ -194,7 +201,7 @@ char **argv;
 	ox_io_init(cs);
 	if ( cs < 0 || ss < 0 )
 		launch_error("cannot connect to the client");
-	cpid = ox_spawn(server,ss,dname);
+	cpid = ox_spawn(server,ss,dname,nolog);
 
 	while ( 1 ) {
 		ox_recv(sindex,&id,&obj);
@@ -227,7 +234,8 @@ int cmd;
 	switch ( cmd ) {
 		case SM_shutdown:
 			SetEvent(hKill);
-			exit(0); break;
+			ExitProcess(0);
+			break;
 		case SM_control_intr:
 			SetEvent(hIntr);
 			break;
@@ -275,10 +283,11 @@ int cmd;
 }
 #endif
 
-static int ox_spawn(prog,bs,dname)
+static int ox_spawn(prog,bs,dname,nolog)
 char *prog;
 int bs;
 char *dname;
+int nolog;
 {
 #if defined(VISUAL)
 	char *av[BUFSIZ];
@@ -287,7 +296,14 @@ char *dname;
 	HANDLE hProc;
 	STRING rootdir;
 	int mypid;
+	int newbs;
 		
+	DuplicateHandle(GetCurrentProcess(),(HANDLE)bs,
+					GetCurrentProcess(),(HANDLE *)&newbs,
+					0,TRUE,DUPLICATE_SAME_ACCESS);
+	close(bs);
+	bs = newbs;
+
 	mypid = GetCurrentProcessId();
 	sprintf(ox_intr,"ox_intr_%d",mypid);
 	sprintf(ox_reset,"ox_reset_%d",mypid);
@@ -298,12 +314,14 @@ char *dname;
 	sprintf(sock_id,"%d",bs);
 	av[0] = prog;
 	av[1] = sock_id;
-	av[2] = ox_intr;
-	av[3] = ox_reset;
-	av[4] = ox_kill;
-	av[5] = NULL;
+	av[2] = dname; /* if dname == "1" then a message window is opened */
+	av[3] = ox_intr;
+	av[4] = ox_reset;
+	av[5] = ox_kill;
+	av[6] = NULL;
 	Pget_rootdir(&rootdir);
 	sprintf(AsirExe,"%s\\bin\\engine.exe",BDY(rootdir));
+	_fileinfo = 1;
 	hProc = _spawnv(_P_NOWAIT,AsirExe,av);
 	return (int)hProc;
 #else /* VISUAL */
@@ -312,6 +330,7 @@ char *dname;
 	int pid;
 	char wname[BUFSIZ];
 	char buf[BUFSIZ];
+	char errcode;
 
 	pid = fork();
 	if ( pid )
@@ -338,17 +357,30 @@ char *dname;
 				close(i);
 #endif
 		}
-		if ( strcmp(dname,"0") )
-			execl(prog,prog,"-display",dname,0);
-		else {
+		if ( !nolog && !strcmp(dname,"1" ) ) /* XXX: for ssh */
+			execl(prog,prog,0);
+		else if ( nolog || !strcmp(dname,"0") ) {
 			FILE *null;
 
 			null = fopen("/dev/null","wb");
 			dup2(fileno(null),1);
 			dup2(fileno(null),2);
-			putenv("DISPLAY=");
-			execl(prog,prog,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=");
+				execl(prog,prog,0);
+			}
+		} else
+			execl(prog,prog,"-display",dname,0);
+		/* On failure */
+		errcode = 2;
+		write(4,&errcode,1);
+		exit(1);
 	}
 #endif
 }
@@ -380,5 +412,11 @@ static Obj pop_one() {
 	if ( asir_OperandStackPtr >= 0 ) {
 		return asir_OperandStack[asir_OperandStackPtr--];
 	}
+}
+
+static void terminate_server()
+{
+	kill(cpid,SIGKILL);
+	exit(0);
 }