=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/io/tcpf.c,v retrieving revision 1.1.1.1 retrieving revision 1.4 diff -u -p -r1.1.1.1 -r1.4 --- OpenXM_contrib2/asir2000/io/tcpf.c 1999/12/03 07:39:11 1.1.1.1 +++ OpenXM_contrib2/asir2000/io/tcpf.c 1999/12/24 06:57:22 1.4 @@ -1,4 +1,4 @@ -/* $OpenXM: OpenXM/src/asir99/io/tcpf.c,v 1.8 1999/11/19 10:41:08 noro Exp $ */ +/* $OpenXM: OpenXM_contrib2/asir2000/io/tcpf.c,v 1.3 1999/12/21 04:20:42 noro Exp $ */ #if INET #include "ca.h" #include "parse.h" @@ -93,7 +93,7 @@ struct ftab tcp_tab[] = { {"ox_pop0_local",Pox_pop0_local,1}, {"ox_pop_cmo",Pox_pop_cmo,1}, {"ox_pop0_cmo",Pox_pop0_cmo,1}, - {"ox_get",Pox_get,1}, + {"ox_get",Pox_get,-1}, {"ox_pops",Pox_pops,-2}, {"ox_push_vl",Pox_push_vl,1}, @@ -401,8 +401,10 @@ char *control_port_str,*server_port_str; conn_str = conn_to_serv ? "1" : "0"; rsh = use_ssh ? "ssh" : RSH; gethostname(localhost,BUFSIZ); +#if !defined(VISUAL) if ( use_unix ) { if ( !fork() ) { + setpgid(0,getpid()); if ( dname ) execlp("xterm","xterm","-name",OX_XTERM,"-display",dname, "-geometry","60x10","-e",launcher,".",conn_str, @@ -425,7 +427,9 @@ char *control_port_str,*server_port_str; fprintf(stderr,"%s\n",cmd); sleep(20); /* system(cmd); */ - } else { + } else +#endif /* VISUAL */ + { if ( dname ) sprintf(cmd, "%s -n %s \"xterm -name %s -display %s -geometry 60x10 -e %s %s %s %s %s %s %s>&/dev/null&\">/dev/null", @@ -735,13 +739,20 @@ void Pox_get(arg,rp) NODE arg; Obj *rp; { - int index = QTOS((Q)ARG0(arg)); + int index; int s; - valid_mctab_index(index); - s = m_c_tab[index].c; - ox_flush_stream_force(s); - ox_get_result(s,rp); + if ( !arg ) { + /* client->server */ + ox_get_result(0,rp); + } else { + /* server->client */ + index = QTOS((Q)ARG0(arg)); + valid_mctab_index(index); + s = m_c_tab[index].c; + ox_flush_stream_force(s); + ox_get_result(s,rp); + } } void Pox_pops(arg,rp)