=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/io/ox_asir.c,v retrieving revision 1.27 retrieving revision 1.30 diff -u -p -r1.27 -r1.30 --- OpenXM_contrib2/asir2000/io/ox_asir.c 2001/09/20 23:11:42 1.27 +++ OpenXM_contrib2/asir2000/io/ox_asir.c 2001/10/05 10:23:06 1.30 @@ -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.26 2001/09/20 10:44:18 noro Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/io/ox_asir.c,v 1.29 2001/10/05 02:33:41 noro Exp $ */ #include "ca.h" #include "parse.h" @@ -706,7 +706,8 @@ void ox_asir_init(int argc,char **argv) fclose(ifp); } input_init(0,"string"); -#if !MPI +/* XXX Windows compatibility */ +#if defined(VISUAL) ox_io_init(); #endif create_my_mathcap("ox_asir"); @@ -718,6 +719,7 @@ void ox_io_init() { int i; /* XXX : ssh forwards stdin to a remote host */ +#if !defined(VISUAL) #if defined(linux) || defined(__NeXT__) || defined(ultrix) #include close(0); @@ -732,6 +734,7 @@ void ox_io_init() { for ( i = 5; i < rl.rlim_cur; i++ ) close(i); #endif +#endif I_am_server = 1; endian_init(); @@ -784,7 +787,7 @@ void asir_ox_push_cmo(void *cmo) /* * Pop an object from the stack and converts it - * int a binary encoded CMO. + * into a binary encoded CMO. */ int asir_ox_pop_cmo(void *cmo, int limit) @@ -806,6 +809,30 @@ int asir_ox_pop_cmo(void *cmo, int limit) return len; } else return -1; +} + +int asir_ox_pop_string(void *string, int limit) +{ + Obj val; + int l; + + val = asir_pop_one(); + if ( !val ) { + if ( limit >= 2 ) { + sprintf(string,"0"); + l = strlen(string); + } else + l = -1; + } else { + l = estimate_length(CO,val); + if ( l+1 <= limit ) { + soutput_init(string); + sprintexpr(CO,val); + l = strlen(string); + } else + l = -1; + } + return l; } /*