===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/io/ox_launch.c,v
retrieving revision 1.2
retrieving revision 1.9
diff -u -p -r1.2 -r1.9
--- OpenXM_contrib2/asir2000/io/ox_launch.c	2000/02/08 04:47:11	1.2
+++ OpenXM_contrib2/asir2000/io/ox_launch.c	2000/11/07 09:31:36	1.9
@@ -1,4 +1,51 @@
-/* $OpenXM: OpenXM_contrib2/asir2000/io/ox_launch.c,v 1.1.1.1 1999/12/03 07:39:11 noro Exp $ */
+/*
+ * Copyright (c) 1994-2000 FUJITSU LABORATORIES LIMITED 
+ * All rights reserved.
+ * 
+ * FUJITSU LABORATORIES LIMITED ("FLL") hereby grants you a limited,
+ * non-exclusive and royalty-free license to use, copy, modify and
+ * redistribute, solely for non-commercial and non-profit purposes, the
+ * computer program, "Risa/Asir" ("SOFTWARE"), subject to the terms and
+ * conditions of this Agreement. For the avoidance of doubt, you acquire
+ * only a limited right to use the SOFTWARE hereunder, and FLL or any
+ * third party developer retains all rights, including but not limited to
+ * copyrights, in and to the SOFTWARE.
+ * 
+ * (1) FLL does not grant you a license in any way for commercial
+ * purposes. You may use the SOFTWARE only for non-commercial and
+ * non-profit purposes only, such as academic, research and internal
+ * business use.
+ * (2) The SOFTWARE is protected by the Copyright Law of Japan and
+ * international copyright treaties. If you make copies of the SOFTWARE,
+ * with or without modification, as permitted hereunder, you shall affix
+ * to all such copies of the SOFTWARE the above copyright notice.
+ * (3) An explicit reference to this SOFTWARE and its copyright owner
+ * shall be made on your publication or presentation in any form of the
+ * results obtained by use of the SOFTWARE.
+ * (4) In the event that you modify the SOFTWARE, you shall notify FLL by
+ * e-mail at risa-admin@sec.flab.fujitsu.co.jp of the detailed specification
+ * for such modification or the source code of the modified part of the
+ * SOFTWARE.
+ * 
+ * THE SOFTWARE IS PROVIDED AS IS WITHOUT ANY WARRANTY OF ANY KIND. FLL
+ * MAKES ABSOLUTELY NO WARRANTIES, EXPRESSED, IMPLIED OR STATUTORY, AND
+ * EXPRESSLY DISCLAIMS ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT OF THIRD PARTIES'
+ * RIGHTS. NO FLL DEALER, AGENT, EMPLOYEES IS AUTHORIZED TO MAKE ANY
+ * MODIFICATIONS, EXTENSIONS, OR ADDITIONS TO THIS WARRANTY.
+ * UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, TORT, CONTRACT,
+ * OR OTHERWISE, SHALL FLL BE LIABLE TO YOU OR ANY OTHER PERSON FOR ANY
+ * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+ * DAMAGES OF ANY CHARACTER, INCLUDING, WITHOUT LIMITATION, DAMAGES
+ * ARISING OUT OF OR RELATING TO THE SOFTWARE OR THIS AGREEMENT, DAMAGES
+ * FOR LOSS OF GOODWILL, WORK STOPPAGE, OR LOSS OF DATA, OR FOR ANY
+ * DAMAGES, EVEN IF FLL SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF
+ * SUCH DAMAGES, OR FOR ANY CLAIM BY ANY OTHER PARTY. EVEN IF A PART
+ * 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.8 2000/11/07 06:35:39 noro Exp $ 
+*/
 #include <setjmp.h>
 #include <signal.h>
 #include <fcntl.h>
@@ -6,6 +53,7 @@
 #include "com.h"
 #include "ox.h"
 #if defined(VISUAL)
+#include <stdlib.h>
 #include <windows.h>
 #include <io.h>
 #include <fcntl.h>
@@ -180,7 +228,8 @@ int cmd;
 	switch ( cmd ) {
 		case SM_shutdown:
 			SetEvent(hKill);
-			exit(0); break;
+			ExitProcess(0);
+			break;
 		case SM_control_intr:
 			SetEvent(hIntr);
 			break;
@@ -240,7 +289,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);
@@ -251,12 +307,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 */
@@ -265,6 +323,7 @@ char *dname;
 	int pid;
 	char wname[BUFSIZ];
 	char buf[BUFSIZ];
+	char errcode;
 
 	pid = fork();
 	if ( pid )
@@ -291,9 +350,9 @@ char *dname;
 				close(i);
 #endif
 		}
-		if ( strcmp(dname,"0") )
-			execl(prog,prog,"-display",dname,0);
-		else {
+		if ( !strcmp(dname,"1" ) ) /* XXX: for ssh */
+			execl(prog,prog,0);
+		else if ( !strcmp(dname,"0") ) {
 			FILE *null;
 
 			null = fopen("/dev/null","wb");
@@ -301,7 +360,12 @@ char *dname;
 			dup2(fileno(null),2);
 			putenv("DISPLAY=");
 			execl(prog,prog,0);
-		}
+		} else
+			execl(prog,prog,"-display",dname,0);
+		/* On failure */
+		errcode = 2;
+		write(4,&errcode,1);
+		exit(1);
 	}
 #endif
 }