=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/io/ox_launch.c,v retrieving revision 1.1.1.1 retrieving revision 1.25 diff -u -p -r1.1.1.1 -r1.25 --- OpenXM_contrib2/asir2000/io/ox_launch.c 1999/12/03 07:39:11 1.1.1.1 +++ OpenXM_contrib2/asir2000/io/ox_launch.c 2015/08/06 10:01:52 1.25 @@ -1,11 +1,59 @@ -/* $OpenXM: OpenXM/src/asir99/io/ox_launch.c,v 1.1.1.1 1999/11/10 08:12:30 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.24 2011/02/06 07:07:39 ohara Exp $ +*/ +#include +#include +#include #include "ca.h" #include "com.h" #include "ox.h" -#include -#include -#include -#if defined(VISUAL) +#if defined(VISUAL) || defined(__MINGW32__) || defined(__MINGW64__) || defined(__MINGW32__) || defined(__MINGW64__) +#include #include #include #include @@ -21,19 +69,19 @@ #include #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 *); +static int ox_spawn(char *,int,char *,char *); 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; @@ -54,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 @@ -100,21 +110,27 @@ char *file; argv[4] : server_port 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; { - int id; - Obj p,obj; +#if !defined(VISUAL) && !defined(__MINGW32__) && !defined(__MINGW64__) + Obj p; char *name; char buf[BUFSIZ]; +#endif + int id; + Obj obj; int cs,ss; unsigned int cmd; 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); @@ -125,16 +141,32 @@ char **argv; server_port_str = argv[4]; server = argv[5]; dname = argv[6]; + 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 +#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); @@ -147,7 +179,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); @@ -167,20 +199,17 @@ char **argv; } } -#if defined(VISUAL) +#if defined(VISUAL) || defined(__MINGW32__) || defined(__MINGW64__) 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: SetEvent(hKill); - exit(0); break; + ExitProcess(0); + break; case SM_control_intr: SetEvent(hIntr); break; @@ -228,19 +257,27 @@ int cmd; } #endif -static int ox_spawn(prog,bs,dname) +static int ox_spawn(prog,bs,dname,nolog) char *prog; int bs; char *dname; +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]; - HANDLE hProc; + int hProc; STRING rootdir; int mypid; + int newbs; + DuplicateHandle(GetCurrentProcess(),(HANDLE)bs, + GetCurrentProcess(),(HANDLE *)&newbs, + 0,TRUE,DUPLICATE_SAME_ACCESS); + closesocket(bs); + bs = newbs; + mypid = GetCurrentProcessId(); sprintf(ox_intr,"ox_intr_%d",mypid); sprintf(ox_reset,"ox_reset_%d",mypid); @@ -251,12 +288,21 @@ 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; - Pget_rootdir(&rootdir); - sprintf(AsirExe,"%s\\bin\\engine.exe",BDY(rootdir)); + 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; + 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 */ @@ -265,18 +311,19 @@ char *dname; int pid; char wname[BUFSIZ]; char buf[BUFSIZ]; + 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 close(0); for ( i = 5; i < NOFILE; i++ ) @@ -291,17 +338,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,(char *)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,(char *)0); + } else if ( strcmp(dname,"0") ) + execl(prog,prog,"-display",dname,(char *)0); + else { + putenv("DISPLAY="); + execl(prog,prog,(char *)0); + } + } else + execl(prog,prog,"-display",dname,(char *)0); + /* On failure */ + errcode = 2; + write(4,&errcode,1); + exit(1); } #endif } @@ -312,7 +372,7 @@ char *s; exit(0); } -static int ox_io_init(sock) +static void ox_io_init(sock) int sock; { endian_init(); @@ -333,5 +393,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); }