=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/main.c,v retrieving revision 1.14 retrieving revision 1.20 diff -u -p -r1.14 -r1.20 --- OpenXM_contrib2/asir2000/parse/main.c 2001/12/27 07:51:17 1.14 +++ OpenXM_contrib2/asir2000/parse/main.c 2003/03/07 06:39:59 1.20 @@ -45,12 +45,12 @@ * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE, * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE. * - * $OpenXM: OpenXM_contrib2/asir2000/parse/main.c,v 1.13 2001/12/25 02:39:06 noro Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/parse/main.c,v 1.19 2003/03/07 03:12:31 noro Exp $ */ #include "ca.h" #include "parse.h" -#if PARI +#if defined(PARI) #include "genpari.h" /* XXX : environment is defined in libpari.a */ @@ -98,11 +98,11 @@ main(int argc,char *argv[]) char *homedir; char *ptr; #if !defined(VISUAL) - char *slash,*binname; + char *slash,*bslash,*binname,*p; #endif StackBottom = &tmp; -#if MPI +#if defined(MPI) mpi_init(); if ( mpi_myid ) { int slave_argc; @@ -117,21 +117,26 @@ main(int argc,char *argv[]) ox_mpi_master_init(); #elif !defined(VISUAL) slash = (char *)rindex(argv[0],'/'); + bslash = (char *)rindex(argv[0],'\\'); if ( slash ) binname = slash+1; + else if ( bslash ) + binname = bslash+1; else binname = argv[0]; - if ( !strcmp(binname,"ox_asir") ) { + for ( p = binname; *p; p++ ) + *p = tolower(*p); + if ( !strncmp(binname,"ox_asir",strlen("ox_asir")) ) { /* never return */ ox_main(argc,argv); exit(0); -#if DO_PLOT - } else if ( !strcmp(binname,"ox_plot") ) { +#if defined(DO_PLOT) + } else if ( !strncmp(binname,"ox_plot",strlen("ox_plot")) ) { /* never return */ ox_plot_main(argc,argv); exit(0); #endif - } else if ( !strcmp(binname,"ox_launch") ) { + } else if ( !strncmp(binname,"ox_launch",strlen("ox_launch")) ) { /* never return */ launch_main(argc,argv); exit(0); @@ -146,7 +151,7 @@ main(int argc,char *argv[]) endian_init(); GC_init(); process_args(--argc,++argv); -#if PARI +#if defined(PARI) risa_pari_init(); #endif copyright(); @@ -197,7 +202,7 @@ main(int argc,char *argv[]) input_init(stdin,"stdin"); prompt(); while ( 1 ) { -#if PARI +#if defined(PARI) recover(0); /* XXX environement is defined in libpari.a */ if ( setjmp(environnement) ) {