===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/main.c,v
retrieving revision 1.15
retrieving revision 1.24
diff -u -p -r1.15 -r1.24
--- OpenXM_contrib2/asir2000/parse/main.c	2001/12/28 02:17:33	1.15
+++ OpenXM_contrib2/asir2000/parse/main.c	2004/01/07 06:25:42	1.24
@@ -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.14 2001/12/27 07:51:17 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/parse/main.c,v 1.23 2003/12/23 06:30:14 noro Exp $ 
 */
 #include "ca.h"
 #include "parse.h"
 
-#if PARI
+#if defined(PARI)
 #include "genpari.h"
 
 /* XXX : environment is defined in libpari.a */
@@ -92,17 +92,19 @@ main(int argc,char *argv[])
 	extern int read_exec_file;
 	extern int do_asirrc;
 	extern int do_file;
+	extern char *do_filename;
+	extern int asir_setenv;
 	extern FILE *in_fp;
 	extern int *StackBottom;
 	char *getenv();
 	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,15 +119,20 @@ 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];
+	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
+#if defined(DO_PLOT)
 	} else if ( !strncmp(binname,"ox_plot",strlen("ox_plot")) ) {
 		/* never return */
 		ox_plot_main(argc,argv);
@@ -145,11 +152,14 @@ main(int argc,char *argv[])
 	env_init();
 	endian_init();
 	GC_init();
+	cppname_init();
 	process_args(--argc,++argv);
-#if PARI 
+#if defined(PARI)
     risa_pari_init();
 #endif 
-	copyright();
+	if (!do_quiet) {
+		copyright();
+	}
 	output_init();
 	arf_init();
 	nglob_init();
@@ -182,7 +192,12 @@ main(int argc,char *argv[])
 	}
 
 	if ( do_asirrc && (ifp = fopen(ifname,"r")) ) {
-		input_init(ifp,ifname);
+		if (!asir_setenv) {
+			input_init(ifp,ifname);
+		}else {
+			asir_infile=NULL;
+			loadasirfile(ifname);
+		}
 		if ( !SETJMP(main_env) ) {
 			read_exec_file = 1;
 			read_eval_loop();
@@ -191,13 +206,18 @@ main(int argc,char *argv[])
 		fclose(ifp);
 	}
 
-	if ( do_file )
-		input_init(in_fp,"stdin");
-	else
+	if ( do_file ) {
+		if (!asir_setenv) {
+			input_init(in_fp,"stdin");
+		}else {
+			asir_infile=NULL;
+			loadasirfile(do_filename);
+		}
+	}else
 		input_init(stdin,"stdin");
 	prompt();
 	while ( 1 ) {
-#if PARI
+#if defined(PARI)
 		recover(0);
 		/* XXX environement is defined in libpari.a */
 		if ( setjmp(environnement) ) {
@@ -207,6 +227,7 @@ main(int argc,char *argv[])
 #endif
 		if ( SETJMP(main_env) )
 			prompt();
+		restore_handler();
 		read_eval_loop();
 	}
 }