===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/main.c,v
retrieving revision 1.5
retrieving revision 1.21
diff -u -p -r1.5 -r1.21
--- OpenXM_contrib2/asir2000/parse/main.c	2000/08/22 05:04:27	1.5
+++ OpenXM_contrib2/asir2000/parse/main.c	2003/04/02 09:43:33	1.21
@@ -45,36 +45,45 @@
  * 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.4 2000/08/21 08:31:47 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/parse/main.c,v 1.20 2003/03/07 06:39:59 noro Exp $ 
 */
 #include "ca.h"
 #include "parse.h"
-#if defined(THINK_C)
-#include <console.h>
-#endif
 
-#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 int *StackBottom;
+extern JMP_BUF main_env;
 
+#if defined(INTERVAL)
+#ifndef ASIRRCNAME
+#define ASIRRCNAME      "int_asirrc"
+#endif
+#else
+#ifndef ASIRRCNAME
+#define ASIRRCNAME      "asirrc"
+#endif
+#endif
+
+
 double get_current_time();
+void init_socket();
+void recover();
+
 extern int mpi_nprocs,mpi_myid;
 
 #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;
@@ -84,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
 
-	StackBottom = &tmp + 1; /* XXX */
-#if MPI
+	StackBottom = &tmp;
+#if defined(MPI)
 	mpi_init();
 	if ( mpi_myid ) {
 		int slave_argc;
@@ -105,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);
@@ -129,18 +146,13 @@ char *argv[];
 	srandom((int)get_current_time());
 /*	mt_sgenrand((unsigned long)get_current_time()); */
 
-#if defined(THINK_C)
-	param_init();
-#endif
 	rtime_init();
 	env_init();
 	endian_init();
-#if 0 && !defined(VISUAL) && !defined(THINK_C)
-	check_key();
-#endif
 	GC_init();
+	cppname_init();
 	process_args(--argc,++argv);
-#if PARI 
+#if defined(PARI)
     risa_pari_init();
 #endif 
 	copyright();
@@ -165,9 +177,6 @@ char *argv[];
 	if ( ptr = getenv("ASIR_CONFIG") )
 		strcpy(ifname,ptr);
 	else {
-#if defined(THINK_C)
-		sprintf(ifname,"asirrc");
-#else
 		homedir = getenv("HOME");
 		if ( !homedir ) {
 			char rootname[BUFSIZ];
@@ -175,13 +184,12 @@ char *argv[];
 			get_rootdir(rootname,sizeof(rootname));
 			homedir = rootname;
 		}
-		sprintf(ifname,"%s/.asirrc",homedir);
-#endif
+		sprintf(ifname,"%s/." ASIRRCNAME,homedir);
 	}
 
 	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;
@@ -195,14 +203,15 @@ 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();
 		read_eval_loop();
 	}
@@ -211,8 +220,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