===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/main.c,v
retrieving revision 1.12
retrieving revision 1.20
diff -u -p -r1.12 -r1.20
--- OpenXM_contrib2/asir2000/parse/main.c	2001/12/20 08:18:27	1.12
+++ OpenXM_contrib2/asir2000/parse/main.c	2003/03/07 06:39:59	1.20
@@ -45,18 +45,19 @@
  * 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.11 2001/10/09 01:36:24 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 */
 extern jmp_buf environnement;
 #endif
 
-extern jmp_buf main_env;
+extern JMP_BUF main_env;
 
 #if defined(INTERVAL)
 #ifndef ASIRRCNAME
@@ -97,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;
@@ -116,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);
@@ -145,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();
@@ -182,7 +188,7 @@ main(int argc,char *argv[])
 
 	if ( do_asirrc && (ifp = fopen(ifname,"r")) ) {
 		input_init(ifp,ifname);
-		if ( !setjmp(main_env) ) {
+		if ( !SETJMP(main_env) ) {
 			read_exec_file = 1;
 			read_eval_loop();
 			read_exec_file = 0;
@@ -196,14 +202,15 @@ 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) ) {
 			avma = top; recover(1);
 			resetenv("");
 		}
 #endif
-		if ( setjmp(main_env) )
+		if ( SETJMP(main_env) )
 			prompt();
 		read_eval_loop();
 	}