===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/main.c,v
retrieving revision 1.31
retrieving revision 1.36
diff -u -p -r1.31 -r1.36
--- OpenXM_contrib2/asir2000/parse/main.c	2006/09/25 04:57:55	1.31
+++ OpenXM_contrib2/asir2000/parse/main.c	2015/08/04 06:20:45	1.36
@@ -45,42 +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.30 2006/02/27 00:20:08 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 */
-#  if !(PARI_VERSION_CODE > 131588)
-extern jmp_buf environnement;
-#  endif
+#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();
-void batch_loop();
 
 extern int mpi_nprocs,mpi_myid;
-extern int do_batch;
 
+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
@@ -91,8 +127,7 @@ main(int argc,char *argv[])
 #endif
 {
 	int tmp;
-	FILE *ifp;
-	char ifname[BUFSIZ];
+	char *ifname;
 	extern int GC_dont_gc;
 	extern int do_asirrc;
 	extern int do_file;
@@ -100,9 +135,6 @@ main(int argc,char *argv[])
 	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
@@ -159,10 +191,7 @@ main(int argc,char *argv[])
 	endian_init();
 	cppname_init();
 	process_args(--argc,++argv);
-#if defined(PARI)
-    risa_pari_init();
-#endif 
-	if (!do_batch && !do_quiet) {
+	if (!do_quiet) {
 		copyright();
 	}
 	output_init();
@@ -184,20 +213,6 @@ 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);
@@ -206,26 +221,13 @@ main(int argc,char *argv[])
 		input_init(stdin,"stdin");
 	}
 
-	if ( do_asirrc && (ifp = fopen(ifname,"r")) ) {
-		fclose(ifp);
+	if ( do_asirrc && (ifname = find_asirrc()) ) {
 		if ( !SETJMP(main_env) )
 			execasirfile(ifname);
 	}
-	if ( do_batch )
-		batch_loop();
 
 	prompt();
 	while ( 1 ) {
-#if defined(PARI)
-		recover(0);
-		/* XXX environement is defined in libpari.a */
-#  if !(PARI_VERSION_CODE > 131588)
-		if ( setjmp(environnement) ) {
-			avma = top; recover(1);
-			resetenv("");
-		}
-#  endif
-#endif
 		if ( SETJMP(main_env) )
 			prompt();
 		if ( !do_file ) {
@@ -258,67 +260,4 @@ void set_stacksize()
 		setrlimit(RLIMIT_STACK,&rlim);
 	}
 #endif
-}
-
-void batch_loop()
-{
-	char *inbuf;
-	int i,c,size;
-
-	input_init(0,"string");
-
-	size = 2;
-	inbuf = (char *)malloc(size);
-	while ( 1 ) {
-		for ( i = 0; ; i++ ) {
-			c = getchar();
-			if ( c == '0xff' ) {
-				inbuf[i] = 0;
-				break;
-			} else
-				inbuf[i] = c;
-			if ( i == size-1 ) {
-				size *= 2;
-				inbuf = realloc(inbuf,size);
-			}
-		}
-		execute_string(inbuf);
-	}
-}
-
-/* a function for batch-loop mode */
-
-extern char *parse_strp;
-
-int execute_string(char *cmd)
-{
-	SNODE snode;
-	pointer val;
-#if defined(PARI)
-	recover(0);
-	/* environement is defined in libpari.a */
-# if !(PARI_VERSION_CODE > 131588 )
-	if ( setjmp(environnement) ) {
-		avma = top; recover(1);
-		resetenv("");
-	}
-# endif
-#endif
-	parse_strp = cmd;
-	asir_infile->ln = 1;
-	if ( mainparse(&snode) ) {
-		return -1;
-	}
-	val = evalstat(snode);
-	if ( NEXT(asir_infile) ) {
-		while ( NEXT(asir_infile) ) {
-			if ( mainparse(&snode) ) {
-				return -1;
-			}
-			nextbp = 0;
-			val = evalstat(snode);
-		}
-	}
-	printexpr(CO,val);
-	return 0;
 }