=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/io/ox_asir.c,v retrieving revision 1.31 retrieving revision 1.40 diff -u -p -r1.31 -r1.40 --- OpenXM_contrib2/asir2000/io/ox_asir.c 2001/10/06 00:55:04 1.31 +++ OpenXM_contrib2/asir2000/io/ox_asir.c 2002/08/02 02:28:27 1.40 @@ -44,7 +44,7 @@ * 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.30 2001/10/05 10:23:06 noro Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/io/ox_asir.c,v 1.39 2002/02/25 06:47:39 noro Exp $ */ #include "ca.h" #include "parse.h" @@ -58,11 +58,12 @@ void ox_usr1_handler(); int asir_ox_init(); +/* environement is defined in libpari.a */ extern jmp_buf environnement; extern int do_message; extern int ox_flushing; -extern jmp_buf ox_env; +extern JMP_BUF ox_env; extern MATHCAP my_mathcap; extern int little_endian,ox_sock_id; @@ -77,7 +78,7 @@ Obj *asir_OperandStack; int asir_OperandStackPtr = -1; void ox_io_init(); -void ox_asir_init(int,char **); +void ox_asir_init(int,char **,char *); Obj asir_pop_one(); Obj asir_peek_one(); void asir_push_one(Obj); @@ -134,18 +135,15 @@ void ox_main(int argc,char **argv) { int id; int cmd; Obj obj; - USINT ui; ERR err; - LIST list; - NODE n,n1; unsigned int serial; int ret; extern char LastError[]; - ox_asir_init(argc,argv); + ox_asir_init(argc,argv,"ox_asir"); if ( do_message ) fprintf(stderr,"I'm an ox_asir, Version %d.\n",ASIR_VERSION); - if ( setjmp(ox_env) ) { + if ( SETJMP(ox_env) ) { while ( NEXT(asir_infile) ) closecurrentinput(); ox_send_sync(0); @@ -174,7 +172,7 @@ void ox_main(int argc,char **argv) { break; if ( do_message ) fprintf(stderr," %s\n",name_of_cmd(cmd)); - if ( ret = setjmp(main_env) ) { + if ( ret = SETJMP(main_env) ) { if ( ret == 1 ) { create_error(&err,serial,LastError); asir_push_one((Obj)err); @@ -491,6 +489,7 @@ int asir_executeString() char *cmd; #if PARI recover(0); + /* environement is defined in libpari.a */ if ( setjmp(environnement) ) { avma = top; recover(1); resetenv(""); @@ -522,11 +521,9 @@ static void asir_executeFunction(int serial) int argc; FUNC f; Obj result; - VL vl; NODE n,n1; STRING fname; char *path; - USINT ui; ERR err; Obj arg; static char buf[BUFSIZ]; @@ -639,19 +636,22 @@ Obj asir_peek_one() { } } -void ox_asir_init(int argc,char **argv) +void ox_asir_init(int argc,char **argv,char *servername) { - int tmp; char ifname[BUFSIZ]; extern int GC_dont_gc; extern int read_exec_file; 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; +#if !defined(VISUAL) + int tmp; +#endif #if !defined(VISUAL) && !MPI do_server_in_X11 = 1; /* XXX */ @@ -667,6 +667,10 @@ void ox_asir_init(int argc,char **argv) endian_init(); GC_init(); process_args(--argc,++argv); +#if defined(__CYGWIN__) + if ( !displayname[0] ) + do_server_in_X11 = 0; /* XXX */ +#endif output_init(); arf_init(); nglob_init(); @@ -698,7 +702,7 @@ void ox_asir_init(int argc,char **argv) } if ( do_asirrc && (ifp = fopen(ifname,"r")) ) { input_init(ifp,ifname); - if ( !setjmp(main_env) ) { + if ( !SETJMP(main_env) ) { read_exec_file = 1; read_eval_loop(); read_exec_file = 0; @@ -708,31 +712,31 @@ void ox_asir_init(int argc,char **argv) input_init(0,"string"); /* XXX Windows compatibility */ ox_io_init(); - create_my_mathcap("ox_asir"); + create_my_mathcap(servername); } void ox_io_init() { unsigned char c,rc; extern int I_am_server; - int i; - /* XXX : ssh forwards stdin to a remote host */ -#if !defined(VISUAL) -#if defined(linux) || defined(__NeXT__) || defined(ultrix) + /* XXX : ssh forwards stdin to a remote host on PC Unix */ +#if defined(linux) #include - close(0); - for ( i = 5; i < NOFILE; i++ ) - close(i); -#else + int i; + + close(0); + for ( i = 5; i < NOFILE; i++ ) + close(i); +#elif defined(__FreeBSD__) #include - struct rlimit rl; + int i; + struct rlimit rl; - getrlimit(RLIMIT_NOFILE,&rl); - close(0); - for ( i = 5; i < rl.rlim_cur; i++ ) - close(i); + getrlimit(RLIMIT_NOFILE,&rl); + close(0); + for ( i = 5; i < rl.rlim_cur; i++ ) + close(i); #endif -#endif I_am_server = 1; endian_init(); @@ -745,8 +749,10 @@ void ox_io_init() { iofp[0].in = fdopen(3,"r"); iofp[0].out = fdopen(4,"w"); +#if !defined(__CYGWIN__) setbuffer(iofp[0].in,(char *)malloc(LBUFSIZ),LBUFSIZ); setbuffer(iofp[0].out,(char *)malloc(LBUFSIZ),LBUFSIZ); +#endif signal(SIGUSR1,ox_usr1_handler); #endif asir_OperandStackSize = BUFSIZ; @@ -843,7 +849,7 @@ void asir_ox_push_cmd(int cmd) ERR err; extern char LastError[]; - if ( ret = setjmp(main_env) ) { + if ( ret = SETJMP(main_env) ) { asir_reset_handler(); if ( ret == 1 ) { create_error(&err,0,LastError); /* XXX */ @@ -870,7 +876,7 @@ void asir_ox_execute_string(char *s) MKSTR(str,s); asir_push_one((Obj)str); - if ( ret = setjmp(main_env) ) { + if ( ret = SETJMP(main_env) ) { asir_reset_handler(); if ( ret == 1 ) { create_error(&err,0,LastError); /* XXX */ @@ -894,8 +900,7 @@ int asir_ox_peek_cmo_size() Obj obj; int len; - obj = asir_pop_one(); - asir_push_one(obj); + obj = asir_peek_one(); if ( !valid_as_cmo(obj) ) { fprintf(stderr,"The object at the stack top is invalid as a CMO.\n"); return 0; @@ -904,6 +909,20 @@ int asir_ox_peek_cmo_size() return len; } +int asir_ox_peek_cmo_string_length() +{ + Obj obj; + int len; + + obj = asir_peek_one(); + if ( !valid_as_cmo(obj) ) { + fprintf(stderr,"The object at the stack top is invalid as a CMO.\n"); + return 0; + } + len = estimate_length(CO,obj); + return len+1; +} + /* * Initialization. * byteorder=0 => native @@ -955,7 +974,7 @@ int asir_ox_init(int byteorder) sprintf(ifname,"%s/.asirrc",getenv("HOME")); if ( do_asirrc && (ifp = fopen(ifname,"r")) ) { input_init(ifp,ifname); - if ( !setjmp(main_env) ) { + if ( !SETJMP(main_env) ) { read_exec_file = 1; read_eval_loop(); read_exec_file = 0;