=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/main.c,v retrieving revision 1.19 retrieving revision 1.23 diff -u -p -r1.19 -r1.23 --- OpenXM_contrib2/asir2000/parse/main.c 2003/03/07 03:12:31 1.19 +++ OpenXM_contrib2/asir2000/parse/main.c 2003/12/23 06:30:14 1.23 @@ -45,7 +45,7 @@ * 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.18 2003/02/14 22:29:18 ohara Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/parse/main.c,v 1.22 2003/10/19 02:54:41 ohara Exp $ */ #include "ca.h" #include "parse.h" @@ -102,7 +102,7 @@ main(int argc,char *argv[]) #endif StackBottom = &tmp; -#if MPI +#if defined(MPI) mpi_init(); if ( mpi_myid ) { int slave_argc; @@ -130,7 +130,7 @@ main(int argc,char *argv[]) /* never return */ ox_main(argc,argv); exit(0); -#if DO_PLOT +#if defined(DO_PLOT) } else if ( !strncmp(binname,"ox_plot",strlen("ox_plot")) ) { /* never return */ ox_plot_main(argc,argv); @@ -150,11 +150,14 @@ main(int argc,char *argv[]) env_init(); endian_init(); GC_init(); + cppname_init(); process_args(--argc,++argv); #if defined(PARI) risa_pari_init(); #endif - copyright(); + if (!do_quiet) { + copyright(); + } output_init(); arf_init(); nglob_init(); @@ -212,6 +215,7 @@ main(int argc,char *argv[]) #endif if ( SETJMP(main_env) ) prompt(); + restore_handler(); read_eval_loop(); } }