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

Diff for /OpenXM_contrib2/asir2000/io/tcpf.c between version 1.14 and 1.15

version 1.14, 2000/09/27 09:27:24 version 1.15, 2000/10/06 06:05:23
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/tcpf.c,v 1.13 2000/09/25 04:33:37 noro Exp $   * $OpenXM: OpenXM_contrib2/asir2000/io/tcpf.c,v 1.14 2000/09/27 09:27:24 noro Exp $
 */  */
 #if INET  #if INET
 #include "ca.h"  #include "ca.h"
Line 58 
Line 58 
 #include "ox.h"  #include "ox.h"
   
 #if defined(VISUAL)  #if defined(VISUAL)
   #include <stdlib.h>
 #include <winsock.h>  #include <winsock.h>
   #include <process.h>
 #endif  #endif
   
 #define OX_XTERM "ox_xterm"  #define OX_XTERM "ox_xterm"
Line 487  char *control_port_str,*server_port_str;
Line 489  char *control_port_str,*server_port_str;
         char localhost[BUFSIZ];          char localhost[BUFSIZ];
         char *dname,*conn_str,*rsh;          char *dname,*conn_str,*rsh;
         char dname_str[BUFSIZ];          char dname_str[BUFSIZ];
           char AsirExe[BUFSIZ];
           STRING rootdir;
           char prog[BUFSIZ];
           char *av[BUFSIZ];
   
         dname = use_x ? (char *)getenv("DISPLAY") : 0;          dname = use_x ? (char *)getenv("DISPLAY") : 0;
         conn_str = conn_to_serv ? "1" : "0";          conn_str = conn_to_serv ? "1" : "0";
Line 501  char *control_port_str,*server_port_str;
Line 507  char *control_port_str,*server_port_str;
                 use_ssh = 1;                  use_ssh = 1;
         }          }
         gethostname(localhost,BUFSIZ);          gethostname(localhost,BUFSIZ);
 #if !defined(VISUAL)  #if defined(VISUAL)
           if ( !use_unix )
                   error("spawn_server : not implemented on Windows");
           Pget_rootdir(&rootdir);
           sprintf(AsirExe,"%s\\bin\\engine.exe",BDY(rootdir));
           strcpy(prog,server);
           server = strrchr(prog,'/')+1;
           av[0] = "ox_launch";
           av[1] = "127.0.0.1";
           av[2] = conn_str;
           av[3] = control_port_str;
           av[4] = server_port_str;
           av[5] = server;
           av[6] = use_x ? "1" : "0";
           av[7] = 0;
   
           _spawnv(_P_NOWAIT,AsirExe,av);
   //      _spawnv(_P_NOWAIT,"d:\\home\\noro\\engine2000\\debug\\engine.exe",av);
   //      printf("ox_launch 127.0.0.1 %s %s %s %s 0\n",conn_str,control_port_str,server_port_str,server);
   #else
         if ( use_unix ) {          if ( use_unix ) {
                 if ( !fork() ) {                  if ( !fork() ) {
                         setpgid(0,getpid());                          setpgid(0,getpid());
Line 527  char *control_port_str,*server_port_str;
Line 552  char *control_port_str,*server_port_str;
                 fprintf(stderr,"%s\n",cmd);                  fprintf(stderr,"%s\n",cmd);
                 sleep(20);                  sleep(20);
 /*              system(cmd); */  /*              system(cmd); */
         } else          } else {
 #endif /* VISUAL */  
         {  
                 if ( dname )                  if ( dname )
                         if ( use_ssh )                          if ( use_ssh )
                         sprintf(cmd,                          sprintf(cmd,
Line 548  char *control_port_str,*server_port_str;
Line 571  char *control_port_str,*server_port_str;
                                 control_port_str,server_port_str,server,"0");                                  control_port_str,server_port_str,server,"0");
                 system(cmd);                  system(cmd);
         }          }
   #endif /* VISUAL */
 }  }
   
 void Pox_launch(arg,rp)  void Pox_launch(arg,rp)
Legend:
Removed from v.1.14  
changed lines
  Added in v.1.15
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>