=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/io/ox_asir.c,v retrieving revision 1.54 retrieving revision 1.56 diff -u -p -r1.54 -r1.56 --- OpenXM_contrib2/asir2000/io/ox_asir.c 2004/03/04 06:29:47 1.54 +++ OpenXM_contrib2/asir2000/io/ox_asir.c 2004/03/11 07:40:42 1.56 @@ -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.53 2004/03/01 02:03:27 noro Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/io/ox_asir.c,v 1.55 2004/03/09 07:18:26 noro Exp $ */ #include "ca.h" #include "parse.h" @@ -155,6 +155,9 @@ void ox_main(int argc,char **argv) { if ( SETJMP(ox_env) ) { while ( NEXT(asir_infile) ) closecurrentinput(); + resetpvs(); + reset_engine(); + reset_io(); ox_send_sync(0); } while ( 1 ) { @@ -663,6 +666,20 @@ void asir_evalName(unsigned int serial) asir_push_one(val); } +char *augment_backslash(char *s) +{ + char *p,*r; + int i; + + for ( i = 0, p = s; *p; p++, i++ ) if ( *p == '\\' ) i++; + r = (char *)MALLOC_ATOMIC((i+1)*sizeof(char)); + for ( i = 0, p = s; *p; p++, i++ ) { + if ( *p == '\\' ) r[i++] = '\\'; + r[i] = *p; + } + return r; +} + int asir_executeString() { SNODE snode; @@ -679,7 +696,7 @@ int asir_executeString() # endif #endif cmd = ((STRING)asir_pop_one())->body; - parse_strp = cmd; + parse_strp = augment_backslash(cmd); if ( mainparse(&snode) ) { return -1; }