===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/main.c,v
retrieving revision 1.9
retrieving revision 1.23
diff -u -p -r1.9 -r1.23
--- OpenXM_contrib2/asir2000/parse/main.c	2000/12/22 10:03:32	1.9
+++ OpenXM_contrib2/asir2000/parse/main.c	2003/12/23 06:30:14	1.23
@@ -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.8 2000/12/05 01:24:57 noro 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"
 
-#if PARI
+#if defined(PARI)
 #include "genpari.h"
 
+/* XXX : environment is defined in libpari.a */
 extern jmp_buf environnement;
 #endif
 
-extern jmp_buf env;
+extern JMP_BUF main_env;
 
 #if defined(INTERVAL)
 #ifndef ASIRRCNAME
@@ -70,22 +71,19 @@ extern jmp_buf env;
 
 
 double get_current_time();
+void init_socket();
+void recover();
+
 extern int mpi_nprocs,mpi_myid;
 
-#if MPI
-int *StackBottom;
-#endif
-
 #if defined(VISUAL_LIB)
-void Main(argc,argv)
+void Main(int argc,char *argv[])
 #else
 #if defined(VISUAL)
 void
 #endif
-main(argc,argv)
+main(int argc,char *argv[])
 #endif
-int argc;
-char *argv[];
 {
 	int tmp;
 	FILE *ifp;
@@ -95,13 +93,16 @@ char *argv[];
 	extern int do_asirrc;
 	extern int do_file;
 	extern FILE *in_fp;
+	extern int *StackBottom;
 	char *getenv();
 	char *homedir;
-	char *slash,*binname;
 	char *ptr;
+#if !defined(VISUAL)
+	char *slash,*bslash,*binname,*p;
+#endif
 
-#if MPI
 	StackBottom = &tmp;
+#if defined(MPI)
 	mpi_init();
 	if ( mpi_myid ) {
 		int slave_argc;
@@ -116,21 +117,26 @@ 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);
@@ -144,11 +150,14 @@ 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 +191,7 @@ char *argv[];
 
 	if ( do_asirrc && (ifp = fopen(ifname,"r")) ) {
 		input_init(ifp,ifname);
-		if ( !setjmp(env) ) {
+		if ( !SETJMP(main_env) ) {
 			read_exec_file = 1;
 			read_eval_loop();
 			read_exec_file = 0;
@@ -196,15 +205,17 @@ 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(env) )
+		if ( SETJMP(main_env) )
 			prompt();
+		restore_handler();
 		read_eval_loop();
 	}
 }
@@ -212,8 +223,6 @@ char *argv[];
 #if !defined(VISUAL_LIB)
 /* a dummy function */
 
-void set_error(code,reasion,action)
-int code;
-char *reasion,*action;
+void set_error(int code,char *reason,char *action)
 {}
 #endif