===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/io/ox_launch.c,v
retrieving revision 1.9.2.1
retrieving revision 1.15
diff -u -p -r1.9.2.1 -r1.15
--- OpenXM_contrib2/asir2000/io/ox_launch.c	2000/11/08 08:31:55	1.9.2.1
+++ OpenXM_contrib2/asir2000/io/ox_launch.c	2001/10/09 01:36:21	1.15
@@ -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.9 2000/11/07 09:31:36 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/io/ox_launch.c,v 1.14 2001/07/23 05:05:41 noro Exp $ 
 */
 #include <setjmp.h>
 #include <signal.h>
@@ -76,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 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;
@@ -148,19 +149,23 @@ 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)
 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;
+	int use_unix,accept_client,nolog;
 	char *control_port_str,*server_port_str;
 	char *rhost,*server,*dname;
 
@@ -173,6 +178,7 @@ char **argv;
 	server_port_str = argv[4];
 	server = argv[5];
 	dname = argv[6];
+	nolog = argc > 7 ? 1 : 0;
 
 #if defined(VISUAL)
 		init_socket();
@@ -182,12 +188,15 @@ 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);
 		ss = try_bind_listen(use_unix,server_port_str);
-		cs = try_accept(cs);
-		ss = try_accept(ss);
+		cs = try_accept(use_unix,cs);
+		ss = try_accept(use_unix,ss);
 	} else {
 		cs = try_connect(use_unix,rhost,control_port_str);
 		ss = try_connect(use_unix,rhost,server_port_str);
@@ -195,7 +204,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);
@@ -220,10 +229,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:
@@ -277,16 +282,17 @@ 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];
 	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;
@@ -350,16 +356,24 @@ char *dname;
 				close(i);
 #endif
 		}
-		if ( !strcmp(dname,"1" ) ) /* XXX: for ssh */
+		if ( !nolog && !strcmp(dname,"1" ) ) /* XXX: for ssh */
 			execl(prog,prog,0);
-		else if ( !strcmp(dname,"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 */
@@ -376,7 +390,7 @@ char *s;
 	exit(0);
 }
 
-static int ox_io_init(sock)
+static void ox_io_init(sock)
 int sock;
 {
 	endian_init();
@@ -397,5 +411,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);
 }