=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/io/ox_asir.c,v retrieving revision 1.67 retrieving revision 1.75 diff -u -p -r1.67 -r1.75 --- OpenXM_contrib2/asir2000/io/ox_asir.c 2010/04/23 04:44:52 1.67 +++ OpenXM_contrib2/asir2000/io/ox_asir.c 2015/08/08 14:19:42 1.75 @@ -44,24 +44,24 @@ * OF THE SOFTWARE HAS BEEN DEVELOPED BY A THIRD PARTY, THE THIRD PARTY * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE, * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE. - * $OpenXM: OpenXM_contrib2/asir2000/io/ox_asir.c,v 1.66 2008/11/27 08:27:04 noro Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/io/ox_asir.c,v 1.74 2015/08/06 10:01:52 fujimoto Exp $ */ #include "ca.h" #include "parse.h" #include "signal.h" #include "ox.h" #include "version.h" -#if defined(PARI) -#include "genpari.h" -#endif +char *find_asirrc(); void ox_usr1_handler(); int asir_ox_init(); /* environement is defined in libpari.a */ +#if 0 # if !( PARI_VERSION_CODE > 131588) extern jmp_buf environnement; # endif +#endif extern int myrank_102,nserver_102; extern int do_message; @@ -122,7 +122,7 @@ void ox_mpi_master_init() { /* ordering information is not exchanged */ /* idx should be equal to i */ idx = get_iofp(i,0,0); - register_server(0,idx,idx); + register_server(0,idx,idx,-1); } } @@ -135,7 +135,7 @@ void ox_mpi_slave_init() { /* ordering information is not exchanged */ /* idx should be equal to i */ idx = get_iofp(i,0,0); - register_server(0,idx,idx); + register_server(0,idx,idx,-1); } asir_OperandStackSize = BUFSIZ; asir_OperandStack = (Obj *)CALLOC(asir_OperandStackSize,sizeof(Obj)); @@ -166,7 +166,7 @@ void ox_main(int argc,char **argv) { extern int recv_intr; serial = ox_recv(0,&id,&obj); -#if defined(VISUAL) +#if defined(VISUAL) || defined(__MINGW32__) || defined(__MINGW64__) if ( recv_intr ) { if ( recv_intr == 1 ) { recv_intr = 0; @@ -215,6 +215,9 @@ void ox_main(int argc,char **argv) { if ( do_message ) fprintf(stderr,"\n"); } +#if defined(__MINGW32__) || defined(__MINGW64__) + fflush(stderr); +#endif } static void asir_do_cmd(int cmd,unsigned int serial) @@ -646,7 +649,7 @@ void asir_pops() void asir_setName(unsigned int serial) { char *name; - int l,n; + size_t l,n; char *dummy = "=0;"; SNODE snode; ERR err; @@ -668,7 +671,7 @@ void asir_setName(unsigned int serial) void asir_evalName(unsigned int serial) { char *name; - int l,n; + size_t l,n; SNODE snode; ERR err; pointer val; @@ -705,6 +708,7 @@ int asir_executeString() SNODE snode; pointer val; char *cmd; +#if 0 #if defined(PARI) recover(0); /* environement is defined in libpari.a */ @@ -715,6 +719,7 @@ int asir_executeString() } # endif #endif +#endif cmd = ((STRING)asir_pop_one())->body; /* XXX : probably this is useless */ #if 0 @@ -793,11 +798,7 @@ static void asir_executeFunction(int serial) #endif searchf(noargsysf,func,&f); if ( !f ) - searchf(sysf,func,&f); - if ( !f ) - searchf(ubinf,func,&f); - if ( !f ) - searchf(usrf,func,&f); + gen_searchf_searchonly(func,&f); if ( !f ) { sprintf(buf,"executeFunction : the function %s not found",func); goto error; @@ -871,11 +872,7 @@ static void asir_executeFunctionSync(int serial) #endif searchf(noargsysf,func,&f); if ( !f ) - searchf(sysf,func,&f); - if ( !f ) - searchf(ubinf,func,&f); - if ( !f ) - searchf(usrf,func,&f); + gen_searchf_searchonly(func,&f); if ( !f ) { sprintf(buf,"executeFunction : the function %s not found",func); goto error; @@ -947,29 +944,27 @@ Obj asir_peek_one() { void ox_asir_init(int argc,char **argv,char *servername) { - char ifname[BUFSIZ]; + char *ifname; extern int GC_dont_gc; extern int do_asirrc; extern int do_server_in_X11; extern char displayname[]; - char *getenv(); static ox_asir_initialized = 0; - FILE *ifp; - char *homedir; - char *ptr; int do_server_sav; -#if !defined(VISUAL) +#if !defined(VISUAL) && !defined(__MINGW32__) && !defined(__MINGW64__) int tmp; #endif GC_init(); -#if !defined(VISUAL) && !defined(MPI) +#if !defined(VISUAL) && !defined(__MINGW32__) && !defined(__MINGW64__) && !defined(MPI) do_server_in_X11 = 1; /* XXX */ #endif asir_save_handler(); +#if 0 #if defined(PARI) risa_pari_init(); #endif +#endif srandom((int)get_current_time()); rtime_init(); @@ -992,31 +987,16 @@ void ox_asir_init(int argc,char **argv,char *servernam sysf_init(); parif_init(); order_init(); -#if defined(VISUAL) +#if defined(VISUAL) || defined(__MINGW32__) || defined(__MINGW64__) init_socket(); #endif #if defined(UINIT) reg_sysf(); #endif -/* if ASIR_CONFIG is set, execute it; else execute .asirrc */ - if ( ptr = getenv("ASIR_CONFIG") ) - strcpy(ifname,ptr); - else { - homedir = getenv("HOME"); - if ( !homedir ) { - char rootname[BUFSIZ]; - - get_rootdir(rootname,sizeof(rootname)); - homedir = rootname; - } - sprintf(ifname,"%s/.asirrc",homedir); - } - /* the bottom of the input stack */ input_init(0,"string"); - if ( do_asirrc && (ifp = fopen(ifname,"r")) ) { - fclose(ifp); + if ( do_asirrc && (ifname = find_asirrc()) ) { do_server_sav = do_server_in_X11; do_server_in_X11 = 0; if ( !SETJMP(main_env) ) @@ -1054,7 +1034,7 @@ void ox_io_init() { I_am_server = 1; endian_init(); -#if defined(VISUAL) +#if defined(VISUAL) || defined(__MINGW32__) || defined(__MINGW64__) if ( !ox_sock_id ) exit(0); iofp[0].in = WSIO_open(ox_sock_id,"r"); @@ -1081,10 +1061,10 @@ void ox_io_init() { read_char(iofp[0].in,&rc); iofp[0].conv = c == rc ? 0 : 1; /* XXX; for raw I/O */ - register_server(0,0,0); + register_server(0,0,0,-1); } -#if !defined(VISUAL) +#if !defined(VISUAL) && !defined(__MINGW32__) && !defined(__MINGW64__) /* * Library mode functions */ @@ -1246,22 +1226,22 @@ int asir_ox_peek_cmo_string_length() int asir_ox_init(int byteorder) { int tmp; - char ifname[BUFSIZ]; + char *ifname; extern int GC_dont_gc; extern int do_asirrc; extern int do_server_in_X11; - char *getenv(); static ox_asir_initialized = 0; - FILE *ifp; GC_init(); -#if !defined(VISUAL) && !defined(MPI) +#if !defined(VISUAL) && !defined(__MINGW32__) && !defined(__MINGW64__) && !defined(MPI) do_server_in_X11 = 0; /* XXX */ #endif asir_save_handler(); +#if 0 #if defined(PARI) risa_pari_init(); #endif +#endif srandom((int)get_current_time()); rtime_init(); @@ -1278,16 +1258,14 @@ int asir_ox_init(int byteorder) pf_init(); sysf_init(); parif_init(); -#if defined(VISUAL) +#if defined(VISUAL) || defined(__MINGW32__) || defined(__MINGW64__) init_socket(); #endif #if defined(UINIT) reg_sysf(); #endif input_init(0,"string"); - sprintf(ifname,"%s/.asirrc",getenv("HOME")); - if ( do_asirrc && (ifp = fopen(ifname,"r")) ) { - fclose(ifp); + if ( do_asirrc && (ifname = find_asirrc()) ) { if ( !SETJMP(main_env) ) execasirfile(ifname); }