=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/io/ox_asir.c,v retrieving revision 1.20 retrieving revision 1.24 diff -u -p -r1.20 -r1.24 --- OpenXM_contrib2/asir2000/io/ox_asir.c 2000/10/06 06:05:22 1.20 +++ OpenXM_contrib2/asir2000/io/ox_asir.c 2001/04/23 05:02:29 1.24 @@ -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.19 2000/09/12 06:05:30 noro Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/io/ox_asir.c,v 1.23 2000/12/05 01:24:54 noro Exp $ */ #include "ca.h" #include "parse.h" @@ -419,7 +419,7 @@ void asir_popString() val = asir_pop_one(); if ( !val ) - obuf = 0; + obuf = "0"; else { l = estimate_length(CO,val); buf = (char *)ALLOCA(l+1); @@ -662,16 +662,9 @@ void ox_asir_init(int argc,char **argv) #endif srandom((int)get_current_time()); -#if defined(THINK_C) - param_init(); -#endif - StackBottom = &tmp + 1; /* XXX */ rtime_init(); env_init(); endian_init(); -#if !defined(VISUAL) && !defined(THINK_C) -/* check_key(); */ -#endif GC_init(); process_args(--argc,++argv); output_init(); @@ -694,9 +687,6 @@ void ox_asir_init(int argc,char **argv) if ( ptr = getenv("ASIR_CONFIG") ) strcpy(ifname,ptr); else { -#if defined(THINK_C) - sprintf(ifname,"asirrc"); -#else homedir = getenv("HOME"); if ( !homedir ) { char rootname[BUFSIZ]; @@ -705,7 +695,6 @@ void ox_asir_init(int argc,char **argv) homedir = rootname; } sprintf(ifname,"%s/.asirrc",homedir); -#endif } if ( do_asirrc && (ifp = fopen(ifname,"r")) ) { input_init(ifp,ifname); @@ -725,7 +714,9 @@ void ox_asir_init(int argc,char **argv) void ox_io_init() { unsigned char c,rc; + extern int I_am_server; + I_am_server = 1; endian_init(); #if defined(VISUAL) if ( !ox_sock_id ) @@ -898,16 +889,9 @@ int asir_ox_init(int byteorder) #endif srandom((int)get_current_time()); -#if defined(THINK_C) - param_init(); -#endif - StackBottom = &tmp + 1; /* XXX */ rtime_init(); env_init(); endian_init(); -#if !defined(VISUAL) && !defined(THINK_C) -/* check_key(); */ -#endif GC_init(); /* process_args(argc,argv); */ output_init(); @@ -926,11 +910,7 @@ int asir_ox_init(int byteorder) #if defined(UINIT) reg_sysf(); #endif -#if defined(THINK_C) - sprintf(ifname,"asirrc"); -#else sprintf(ifname,"%s/.asirrc",getenv("HOME")); -#endif if ( do_asirrc && (ifp = fopen(ifname,"r")) ) { input_init(ifp,ifname); if ( !setjmp(env) ) {