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

Diff for /OpenXM_contrib2/asir2018/io/tcpf.c between version 1.2 and 1.5

version 1.2, 2018/09/28 08:20:29 version 1.5, 2020/10/06 06:31:20
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/asir2018/io/tcpf.c,v 1.1 2018/09/19 05:45:08 noro Exp $   * $OpenXM: OpenXM_contrib2/asir2018/io/tcpf.c,v 1.4 2020/01/09 01:47:41 noro Exp $
 */  */
 #include "ca.h"  #include "ca.h"
 #include "parse.h"  #include "parse.h"
 #include "com.h"  #include "com.h"
 #include <signal.h>  #include <signal.h>
 #include <string.h>  #include <string.h>
 #include <sys/types.h>  
 #include <sys/wait.h>  
 #include <stdlib.h>  #include <stdlib.h>
   #if !defined(VISUAL) && !defined(__MINGW32__)
 #include <unistd.h>  #include <unistd.h>
   #include <sys/types.h>
   #include <sys/wait.h>
 #include <pwd.h>  #include <pwd.h>
   #endif
   
 #include "ox.h"  #include "ox.h"
   
Line 78  static struct m_c {
Line 80  static struct m_c {
 } *m_c_tab;  } *m_c_tab;
   
 static int m_c_i,m_c_s;  static int m_c_i,m_c_s;
 int I_am_server;  extern int I_am_server;
   
 extern int little_endian;  extern int little_endian;
   
Line 435  void Pregister_server(NODE arg,Z *rp)
Line 437  void Pregister_server(NODE arg,Z *rp)
   cs = ZTOS((Q)ARG0(arg));    cs = ZTOS((Q)ARG0(arg));
   ss = ZTOS((Q)ARG2(arg));    ss = ZTOS((Q)ARG2(arg));
   if ( IS_CYGWIN || !ARG1(arg) || NUM(ARG1(arg)) ) {    if ( IS_CYGWIN || !ARG1(arg) || NUM(ARG1(arg)) ) {
     sprintf(cport_str,"%d",ZTOS((Q)ARG1(arg)));      sprintf(cport_str,"%ld",ZTOS((Q)ARG1(arg)));
     use_unix = 0;      use_unix = 0;
   } else {    } else {
     strcpy(cport_str,BDY((STRING)ARG1(arg)));      strcpy(cport_str,BDY((STRING)ARG1(arg)));
Line 444  void Pregister_server(NODE arg,Z *rp)
Line 446  void Pregister_server(NODE arg,Z *rp)
   if ( !ARG3(arg) || NUM(ARG3(arg)) ) {    if ( !ARG3(arg) || NUM(ARG3(arg)) ) {
     if ( use_unix )      if ( use_unix )
       error("register_server : the protocol should conincide for two sockets");        error("register_server : the protocol should conincide for two sockets");
     sprintf(sport_str,"%d",ZTOS((Q)ARG3(arg)));      sprintf(sport_str,"%ld",ZTOS((Q)ARG3(arg)));
   } else {    } else {
     if ( !use_unix )      if ( !use_unix )
       error("register_server : the protocol should conincide for two sockets");        error("register_server : the protocol should conincide for two sockets");
Line 873  void spawn_server(char *host,char *launcher,char *serv
Line 875  void spawn_server(char *host,char *launcher,char *serv
       sprintf(cmd,        sprintf(cmd,
         "%s -n %s \"(cd %s; java %s -host %s -control %s -data %s)>&/dev/null&\">/dev/null",          "%s -n %s \"(cd %s; java %s -host %s -control %s -data %s)>&/dev/null&\">/dev/null",
         rsh,host,launcher,server,localhost,          rsh,host,launcher,server,localhost,
         control_port_str,server_port_str,server);          control_port_str,server_port_str);
     fprintf(stderr,"%s\n",cmd);      fprintf(stderr,"%s\n",cmd);
     sleep(20);      sleep(20);
 /*    system(cmd); */  /*    system(cmd); */
Legend:
Removed from v.1.2  
changed lines
  Added in v.1.5
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>