===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/main.c,v
retrieving revision 1.20
retrieving revision 1.36
diff -u -p -r1.20 -r1.36
--- OpenXM_contrib2/asir2000/parse/main.c	2003/03/07 06:39:59	1.20
+++ OpenXM_contrib2/asir2000/parse/main.c	2015/08/04 06:20:45	1.36
@@ -45,37 +45,78 @@
  * 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.19 2003/03/07 03:12:31 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/parse/main.c,v 1.35 2014/05/09 19:35:52 ohara Exp $ 
 */
 #include "ca.h"
 #include "parse.h"
 
-#if defined(PARI)
-#include "genpari.h"
-
-/* XXX : environment is defined in libpari.a */
-extern jmp_buf environnement;
+#include <stdlib.h>
+#if defined(VISUAL)
+#include <io.h>
+#define R_OK 4
+#else
+#include <unistd.h>
+#include <fcntl.h>
 #endif
 
 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();
+void set_stacksize();
 
 extern int mpi_nprocs,mpi_myid;
 
+char *find_asirrc()
+{
+	static char name[BUFSIZ];
+	char dir[BUFSIZ];
+	char *env,*env2;
+
+/* if ASIR_CONFIG is set, execute it; else execute .asirrc */
+	env = getenv("ASIR_CONFIG");
+	if( env && !access(env, R_OK) ) {
+		strcpy(name,env);
+		return name;
+	}
+	env = getenv("HOME");
+	if ( env ) {
+		sprintf(name, "%s/.asirrc", env);
+		if (!access(name, R_OK)) {
+			return name;
+		}
+	}
+#if defined(VISUAL)
+	env  = getenv("HOMEDRIVE");
+	env2 = getenv("HOMEPATH");
+	if ( env && env2 ) {
+		sprintf(name, "%s%s/.asirrc", env, env2);
+		if (!access(name, R_OK)) {
+			return name;
+		}
+	}
+	env  = getenv("APPDATA");
+	if ( env ) {
+		sprintf(name, "%s/OpenXM/.asirrc", env);
+		if (!access(name, R_OK)) {
+			return name;
+		}
+	}
+	get_rootdir(dir, BUFSIZ);
+	sprintf(name, "%s/.asirrc", dir);
+	if (!access(name, R_OK)) {
+		return name;
+	}
+#endif
+	return NULL;
+}
+
 #if defined(VISUAL_LIB)
 void Main(int argc,char *argv[])
 #else
@@ -86,22 +127,21 @@ main(int argc,char *argv[])
 #endif
 {
 	int tmp;
-	FILE *ifp;
-	char ifname[BUFSIZ];
+	char *ifname;
 	extern int GC_dont_gc;
-	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,*bslash,*binname,*p;
 #endif
 
+	set_stacksize();
 	StackBottom = &tmp;
+	GC_init();
 #if defined(MPI)
 	mpi_init();
 	if ( mpi_myid ) {
@@ -149,12 +189,11 @@ main(int argc,char *argv[])
 	rtime_init();
 	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();
@@ -165,6 +204,8 @@ main(int argc,char *argv[])
 	pf_init();
 	sysf_init();
 	parif_init();
+	order_init();
+	/* XXX set the default ordering */
 #if defined(VISUAL)
 	init_socket();
 #endif
@@ -172,46 +213,30 @@ main(int argc,char *argv[])
 	reg_sysf();
 #endif
 
-/* if ASIR_CONFIG is set, execute it; else execute .asirrc */
-	if ( ptr = getenv("ASIR_CONFIG") )
-		strcpy(ifname,ptr);
-	else {
-		homedir = getenv("HOME");
-		if ( !homedir ) {
-			char rootname[BUFSIZ];
-
-			get_rootdir(rootname,sizeof(rootname));
-			homedir = rootname;
-		}
-		sprintf(ifname,"%s/." ASIRRCNAME,homedir);
+	if ( do_file ) {
+		asir_infile=NULL;
+		loadasirfile(do_filename);
+	} else {
+		/* the bottom of the input stack */
+		input_init(stdin,"stdin");
 	}
 
-	if ( do_asirrc && (ifp = fopen(ifname,"r")) ) {
-		input_init(ifp,ifname);
-		if ( !SETJMP(main_env) ) {
-			read_exec_file = 1;
-			read_eval_loop();
-			read_exec_file = 0;
-		}
-		fclose(ifp);
+	if ( do_asirrc && (ifname = find_asirrc()) ) {
+		if ( !SETJMP(main_env) )
+			execasirfile(ifname);
 	}
 
-	if ( do_file )
-		input_init(in_fp,"stdin");
-	else
-		input_init(stdin,"stdin");
 	prompt();
 	while ( 1 ) {
-#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) )
 			prompt();
+		if ( !do_file ) {
+			if ( SETJMP(asir_infile->jmpbuf) )
+				prompt();
+			else
+				asir_infile->ready_for_longjmp = 1;
+		}
+		restore_handler();
 		read_eval_loop();
 	}
 }
@@ -222,3 +247,17 @@ main(int argc,char *argv[])
 void set_error(int code,char *reason,char *action)
 {}
 #endif
+
+void set_stacksize()
+{
+#if !defined(VISUAL)
+	struct rlimit rlim;
+	int c,m;
+
+	getrlimit(RLIMIT_STACK,&rlim);
+	if ( rlim.rlim_cur < (1<<26) ) {
+		rlim.rlim_cur = MIN(1<<26,rlim.rlim_max);
+		setrlimit(RLIMIT_STACK,&rlim);
+	}
+#endif
+}