[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.64 and 1.67

version 1.64, 2013/09/26 00:38:47 version 1.67, 2015/08/05 16:01: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/asir2000/io/tcpf.c,v 1.63 2013/06/13 18:40:31 ohara Exp $   * $OpenXM: OpenXM_contrib2/asir2000/io/tcpf.c,v 1.66 2013/11/22 00:43:41 noro Exp $
 */  */
 #include "ca.h"  #include "ca.h"
 #include "parse.h"  #include "parse.h"
Line 686  void ox_launch_generic(char *host,char *launcher,char 
Line 686  void ox_launch_generic(char *host,char *launcher,char 
         STOQ(ind,*rp);          STOQ(ind,*rp);
 }  }
   
 #if defined(__CYGWIN__)  #if defined(__CYGWIN32__)
 static void bslash2slash(char *buf)  static void bslash2slash(char *buf)
 {  {
         char *p;          char *p;
Line 830  void spawn_server(char *host,char *launcher,char *serv
Line 830  void spawn_server(char *host,char *launcher,char *serv
 //      printf("ox_launch 127.0.0.1 %s %s %s %s 0\n",conn_str,control_port_str,server_port_str,server);  //      printf("ox_launch 127.0.0.1 %s %s %s %s 0\n",conn_str,control_port_str,server_port_str,server);
 #else  #else
         if ( use_unix || !host ) {          if ( use_unix || !host ) {
 #if defined(__CYGWIN__)  #if defined(__CYGWIN32__)
                 get_launcher_path(win_launcher);                  get_launcher_path(win_launcher);
                 if ( dname && strchr(dname,':') ) {                  if ( dname && strchr(dname,':') ) {
                         if ( !fork() ) {                          if ( !fork() ) {
Line 972  void ox_launch_main(int with_x,NODE arg,Obj *p)
Line 972  void ox_launch_main(int with_x,NODE arg,Obj *p)
   
 void extend_mctab(int bound)  void extend_mctab(int bound)
 {  {
         int s,i,n;          int i,n;
         struct m_c *t;          struct m_c *t;
     if ( !m_c_tab ) {      if ( !m_c_tab ) {
         n = (bound/INIT_TAB_SIZ + 1)*INIT_TAB_SIZ;          n = (bound/INIT_TAB_SIZ + 1)*INIT_TAB_SIZ;
Line 985  void extend_mctab(int bound)
Line 985  void extend_mctab(int bound)
     }else if (bound >= m_c_s) {      }else if (bound >= m_c_s) {
         n = (bound/INIT_TAB_SIZ + 1)*INIT_TAB_SIZ;          n = (bound/INIT_TAB_SIZ + 1)*INIT_TAB_SIZ;
         t = (struct m_c *)MALLOC_ATOMIC(n*sizeof(struct m_c));          t = (struct m_c *)MALLOC_ATOMIC(n*sizeof(struct m_c));
         bzero((void *)t,s);          bzero((void *)t,n*sizeof(struct m_c));
         bcopy((void *)m_c_tab,(void *)t,m_c_s*sizeof(struct m_c));          bcopy((void *)m_c_tab,(void *)t,m_c_s*sizeof(struct m_c));
         for ( i = m_c_s; i < n; i++ ) {          for ( i = m_c_s; i < n; i++ ) {
             t[i].af_unix = 0;              t[i].af_unix = 0;
Line 1032  int register_server(int af_unix,int m,int c,int ind)
Line 1032  int register_server(int af_unix,int m,int c,int ind)
 #endif  #endif
         if ( m_c_i == m_c_s ) {          if ( m_c_i == m_c_s ) {
                 s = (m_c_s+INIT_TAB_SIZ)*sizeof(struct m_c);                  s = (m_c_s+INIT_TAB_SIZ)*sizeof(struct m_c);
                 t = (struct m_c *)MALLOC_ATOMIC(s); bzero((void *)m_c_tab,s);                  t = (struct m_c *)MALLOC_ATOMIC(s);
                 bcopy((void *)m_c_tab,(void *)t,m_c_s*sizeof(struct m_c));                  bcopy((void *)m_c_tab,(void *)t,m_c_s*sizeof(struct m_c));
                 for ( i = 0; i < INIT_TAB_SIZ; i++ ) {                  for ( i = 0; i < INIT_TAB_SIZ; i++ ) {
                         m_c_tab[m_c_s+i].af_unix = 0;                          t[m_c_s+i].af_unix = 0;
                         m_c_tab[m_c_s+i].m = m_c_tab[m_c_s+i].c = -1;                          t[m_c_s+i].m = m_c_tab[m_c_s+i].c = -1;
                 }                  }
                 m_c_s += INIT_TAB_SIZ; m_c_tab = t;                  m_c_s += INIT_TAB_SIZ; m_c_tab = t;
         }          }

Legend:
Removed from v.1.64  
changed lines
  Added in v.1.67

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