[BACK]Return to ox_launch.c CVS log [TXT][DIR] Up to [local] / OpenXM_contrib2 / asir2000 / io

Diff for /OpenXM_contrib2/asir2000/io/ox_launch.c between version 1.20 and 1.21

version 1.20, 2004/06/15 09:04:41 version 1.21, 2006/09/26 05:35:26
Line 44 
Line 44 
  * OF THE SOFTWARE HAS BEEN DEVELOPED BY A THIRD PARTY, THE THIRD PARTY   * OF THE SOFTWARE HAS BEEN DEVELOPED BY A THIRD PARTY, THE THIRD PARTY
  * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE,   * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE,
  * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE.   * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE.
  * $OpenXM: OpenXM_contrib2/asir2000/io/ox_launch.c,v 1.19 2004/03/18 01:59:41 noro Exp $   * $OpenXM: OpenXM_contrib2/asir2000/io/ox_launch.c,v 1.20 2004/06/15 09:04:41 noro Exp $
 */  */
 #include <setjmp.h>  #include <setjmp.h>
 #include <signal.h>  #include <signal.h>
Line 74  HANDLE hIntr,hReset,hKill;
Line 74  HANDLE hIntr,hReset,hKill;
 #endif  #endif
   
 static void put_log(char *);  static void put_log(char *);
 static int ox_spawn(char *,int,char *,int);  static int ox_spawn(char *,int,char *,char *);
 static void launch_error(char *);  static void launch_error(char *);
 static void ox_io_init(int);  static void ox_io_init(int);
 static void push_one(Obj);  static void push_one(Obj);
Line 110  char *str;
Line 110  char *str;
         argv[5] : server          argv[5] : server
         argv[6] : display or "0"          argv[6] : display or "0"
         argv[7] : if exists, it should be "-nolog"          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)  void launch_main(argc,argv)
Line 125  char **argv;
Line 126  char **argv;
         Obj obj;          Obj obj;
         int cs,ss;          int cs,ss;
         unsigned int cmd;          unsigned int cmd;
         int use_unix,accept_client,nolog;          int use_unix,accept_client;
         char *control_port_str,*server_port_str;          char *control_port_str,*server_port_str;
         char *rhost,*server,*dname;          char *rhost,*server,*dname,*nolog;
         char *e,*s;          char *e,*s;
   
         GC_init(); nglob_init();          GC_init(); nglob_init();
Line 139  char **argv;
Line 140  char **argv;
         server_port_str = argv[4];          server_port_str = argv[4];
         server = argv[5];          server = argv[5];
         dname = argv[6];          dname = argv[6];
         nolog = argc > 7 ? 1 : 0;          nolog = argc > 7 ? argv[7]: 0;
   
 #if defined(VISUAL)  #if defined(VISUAL)
                 init_socket();                  init_socket();
Line 259  static int ox_spawn(prog,bs,dname,nolog)
Line 260  static int ox_spawn(prog,bs,dname,nolog)
 char *prog;  char *prog;
 int bs;  int bs;
 char *dname;  char *dname;
 int nolog;  char *nolog;
 {  {
 #if defined(VISUAL)  #if defined(VISUAL)
         char *av[BUFSIZ];          char *av[BUFSIZ];
Line 291  int nolog;
Line 292  int nolog;
         av[4] = ox_reset;          av[4] = ox_reset;
         av[5] = ox_kill;          av[5] = ox_kill;
         av[6] = NULL;          av[6] = NULL;
         Pget_rootdir(&rootdir);          if ( nolog ) {
         sprintf(AsirExe,"%s\\bin\\engine.exe",BDY(rootdir));                  sprintf(AsirExe,"\"%s\"",nolog);
                   strcpy(AsirExe,nolog);
           } else {
                   Pget_rootdir(&rootdir);
                   sprintf(AsirExe,"%s\\bin\\engine.exe",BDY(rootdir));
           }
         _fileinfo = 1;          _fileinfo = 1;
         hProc = _spawnv(_P_NOWAIT,AsirExe,av);          hProc = _spawnv(_P_NOWAIT,AsirExe,av);
         return (int)hProc;          return (int)hProc;
Legend:
Removed from v.1.20  
changed lines
  Added in v.1.21
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>