===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/load.c,v
retrieving revision 1.17
retrieving revision 1.23
diff -u -p -r1.17 -r1.23
--- OpenXM_contrib2/asir2000/parse/load.c	2005/03/24 23:40:50	1.17
+++ OpenXM_contrib2/asir2000/parse/load.c	2013/06/13 18:42:11	1.23
@@ -45,7 +45,7 @@
  * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE,
  * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE.
  *
- * $OpenXM: OpenXM_contrib2/asir2000/parse/load.c,v 1.16 2005/03/24 22:54:22 takayama Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/parse/load.c,v 1.22 2012/12/17 07:20:45 noro Exp $ 
 */
 #include "ca.h"
 #include "parse.h"
@@ -76,7 +76,7 @@
 
 #ifdef MALLOC
 #undef MALLOC
-#define MALLOC(x) GC_malloc((x)+4)
+#define MALLOC(x) Risa_GC_malloc((x)+4)
 #endif
 
 char **ASIRLOADPATH;
@@ -103,7 +103,6 @@ char *search_executable(char *name);
 extern char *asir_libdir;
 extern char *asir_contrib_dir;
 extern char *asir_pager;
-extern int read_exec_file;
 extern int main_parser;
 extern JMP_BUF exec_env;
 
@@ -153,6 +152,7 @@ void env_init() {
 #if defined(VISUAL)
 			get_rootdir(rootname,sizeof(rootname));
 			asir_libdir = (char *)malloc(strlen(rootname)+strlen("/lib")+1);
+			sprintf(asir_libdir,"%s/lib",rootname);
 #else
 			asir_libdir = (char *)malloc(strlen(ASIR_LIBDIR)+1);
 			strcpy(asir_libdir,ASIR_LIBDIR);
@@ -224,19 +224,23 @@ void env_init() {
 	ASIRLOADPATH[i] = NULL;
 }
 
+#if defined(VISUAL)
+#define R_OK 4
+#endif
+
 void searchasirpath(char *name,char **pathp)
 {
 	char **p;
 	char *q;
-	int l;
-#if !defined(VISUAL)
+	size_t l;
+	int ret;
 	struct stat sbuf;
 	
 	if ( (name[0] == '/') || ( name[0] == '.') || strchr(name,':')
 		|| !ASIRLOADPATH[0] ) {
 		if ( access(name,R_OK) >= 0 ) {
-			stat(name,&sbuf);
-			if ( (sbuf.st_mode & S_IFMT) != S_IFDIR )
+			ret = stat(name,&sbuf);
+			if ( ret == 0 && (sbuf.st_mode & S_IFMT) != S_IFDIR )
 				*pathp = name;
 			else
 				*pathp = 0;
@@ -247,8 +251,8 @@ void searchasirpath(char *name,char **pathp)
 			l = strlen(*p)+strlen(name)+2;
 			q = (char *)ALLOCA(l); sprintf(q,"%s/%s",*p,name);
 			if ( access(q,R_OK) >= 0 ) {
-				stat(q,&sbuf);
-				if ( (sbuf.st_mode & S_IFMT) != S_IFDIR ) {
+				ret = stat(q,&sbuf);
+				if ( ret == 0 && (sbuf.st_mode & S_IFMT) != S_IFDIR ) {
 					*pathp = (char *)MALLOC(l); strcpy(*pathp,q);
 					return;
 				}
@@ -256,22 +260,6 @@ void searchasirpath(char *name,char **pathp)
 		}
 		*pathp = 0;
 	}
-#else
-	if ( (name[0] == '/') || ( name[0] == '.') || strchr(name,':')
-		|| !ASIRLOADPATH[0] )
-		*pathp = name;
-	else {
-		for ( p = ASIRLOADPATH; *p; p++ ) {
-			l = strlen(*p)+strlen(name)+2;
-			q = (char *)ALLOCA(l); sprintf(q,"%s/%s",*p,name);
-			if ( access(q,04) >= 0 ) {
-				*pathp = (char *)MALLOC(l); strcpy(*pathp,q);
-				return;
-			}
-		}
-		*pathp = 0;
-	}
-#endif
 }
 
 #define DELIM '/'
@@ -384,33 +372,11 @@ void loadasirfile(char *name0)
 void execasirfile(char *name)
 {
 	loadasirfile(name);
-	read_exec_file = 1;
-	read_eval_loop();
-	read_exec_file = 0;
-}
-
-void load_and_execfile(char *name)
-{
-	FILE *fp;
-	INFILE save_asir_infile;
-	int save_prresult;
-	extern prresult;
-
-	savepvs();
-	save_asir_infile = asir_infile;
-	save_prresult = prresult;
-	fp = fopen(name,"rb");
-	input_init(fp,name);
-	if ( !SETJMP(exec_env) ) {
-		/* XXX : information for asir_teriminate() */
-		read_exec_file = 2;
+	if ( !SETJMP(asir_infile->jmpbuf) ) {
+		asir_infile->ready_for_longjmp = 1;
 		read_eval_loop();
-		read_exec_file = 0;
 	}
-	fclose(fp);
-	restorepvs();
-	asir_infile = save_asir_infile;
-	prresult = save_prresult;
+	closecurrentinput();
 }
 
 static NODE objfile = 0;