[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.57 and 1.58

version 1.57, 2010/04/23 04:44:52 version 1.58, 2010/09/01 08:01:09
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.56 2004/08/18 01:10:59 noro Exp $   * $OpenXM: OpenXM_contrib2/asir2000/io/tcpf.c,v 1.57 2010/04/23 04:44:52 noro Exp $
 */  */
 #include "ca.h"  #include "ca.h"
 #include "parse.h"  #include "parse.h"
Line 826  void spawn_server(char *host,char *launcher,char *serv
Line 826  void spawn_server(char *host,char *launcher,char *serv
                                 setpgid(0,getpid());                                  setpgid(0,getpid());
                                 execlp("xterm","xterm","-name",OX_XTERM,"-T","ox_launch:local","-display",dname,                                  execlp("xterm","xterm","-name",OX_XTERM,"-T","ox_launch:local","-display",dname,
                                         "-geometry","60x10","-xrm","XTerm*locale:false","-e",launcher,use_unix?".":"127.1",conn_str,                                          "-geometry","60x10","-xrm","XTerm*locale:false","-e",launcher,use_unix?".":"127.1",conn_str,
                                         control_port_str,server_port_str,server,dname,0);                                          control_port_str,server_port_str,server,dname,(char *)0);
                         }                          }
                 } else if ( dname && get_start_path(win_start) ) {                  } else if ( dname && get_start_path(win_start) ) {
                 sprintf(cmd,"%s %s %s %s %s %s %s 1",                  sprintf(cmd,"%s %s %s %s %s %s %s 1",
Line 837  void spawn_server(char *host,char *launcher,char *serv
Line 837  void spawn_server(char *host,char *launcher,char *serv
                         if ( !fork() ) {                          if ( !fork() ) {
                                 setpgid(0,getpid());                                  setpgid(0,getpid());
                                 execlp(launcher,launcher,use_unix?".":"127.1",conn_str,                                  execlp(launcher,launcher,use_unix?".":"127.1",conn_str,
                                         control_port_str,server_port_str,server,dname0,"-nolog",0);                                          control_port_str,server_port_str,server,dname0,"-nolog",(char *)0);
                         }                          }
                 }                  }
 #else  #else
Line 846  void spawn_server(char *host,char *launcher,char *serv
Line 846  void spawn_server(char *host,char *launcher,char *serv
                         if ( dname )                          if ( dname )
                                 execlp("xterm","xterm","-name",OX_XTERM,"-T","ox_launch:local","-display",dname,                                  execlp("xterm","xterm","-name",OX_XTERM,"-T","ox_launch:local","-display",dname,
                                         "-geometry","60x10","-xrm","XTerm*locale:false","-e",launcher,use_unix?".":"127.1",conn_str,                                          "-geometry","60x10","-xrm","XTerm*locale:false","-e",launcher,use_unix?".":"127.1",conn_str,
                                         control_port_str,server_port_str,server,dname,0);                                          control_port_str,server_port_str,server,dname,(char *)0);
                         else                          else
                                 execlp(launcher,launcher,use_unix?".":"127.1",conn_str,                                  execlp(launcher,launcher,use_unix?".":"127.1",conn_str,
                                         control_port_str,server_port_str,server,dname0,"-nolog",0);                                          control_port_str,server_port_str,server,dname0,"-nolog",(char *)0);
                 }                  }
 #endif  #endif
         } else if ( conn_to_serv == 2 ) {          } else if ( conn_to_serv == 2 ) {

Legend:
Removed from v.1.57  
changed lines
  Added in v.1.58

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>