===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/load.c,v
retrieving revision 1.11
retrieving revision 1.22
diff -u -p -r1.11 -r1.22
--- OpenXM_contrib2/asir2000/parse/load.c	2004/03/02 08:28:49	1.11
+++ OpenXM_contrib2/asir2000/parse/load.c	2012/12/17 07:20:45	1.22
@@ -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.10 2004/03/02 07:44:02 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/parse/load.c,v 1.21 2006/09/13 02:26:13 noro Exp $ 
 */
 #include "ca.h"
 #include "parse.h"
@@ -76,10 +76,10 @@
 
 #ifdef MALLOC
 #undef MALLOC
-#define MALLOC(x) GC_malloc((x)+4)
+#define MALLOC(x) Risa_GC_malloc((x)+4)
 #endif
 
-char *ASIRLOADPATH[32];
+char **ASIRLOADPATH;
 
 #if defined(VISUAL)
 #define ENVDELIM ';'
@@ -90,16 +90,19 @@ char *ASIRLOADPATH[32];
 #endif
 
 #ifndef ASIR_LIBDIR
-#define ASIR_LIBDIR "."
+#define ASIR_LIBDIR "/usr/local/lib/asir"
 #endif
+#ifndef ASIR_CONTRIB_DIR
+#define ASIR_CONTRIB_DIR "/usr/local/lib/asir-contrib"
+#endif
 
 char *getenv();
 void Pget_rootdir();
 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;
 
@@ -111,15 +114,20 @@ char *search_executable(char *name)
 	struct stat buf;
 
 	nlen = strlen(name);
-	for ( s = (char *)getenv("PATH"); *s; ) {
+	for ( s = (char *)getenv("PATH"); s; ) {
 		c = (char *)index(s,':');
-		len = c ? c-s : strlen(dir);
+		len = c ? c-s : strlen(s);
 		if ( len >= BUFSIZ ) continue;
-		strncpy(dir,s,len); s = c+1; dir[len] = 0;
+		strncpy(dir,s,len); dir[len] = 0;
+		if ( c ) s = c+1;
+		else s = 0;
 		if ( len+nlen+1 >= BUFSIZ ) continue;
 		sprintf(path,"%s/%s",dir,name);
 		if ( !stat(path,&buf) && !(buf.st_mode & S_IFDIR) 
-			&& !access(path,X_OK) ) {
+#if !defined(VISUAL)
+			&& !access(path,X_OK)
+#endif
+                ) {
 			len = strlen(path)+1;
 			ret = (char *)MALLOC(len);
 			strcpy(ret,path);
@@ -151,6 +159,23 @@ void env_init() {
 #endif
 		}
 	}
+
+	if ( !(asir_contrib_dir = getenv("ASIR_CONTRIB_DIR")) ) {
+		if ( oxhome = getenv("OpenXM_HOME") ) {
+			asir_contrib_dir = (char *)malloc(strlen(oxhome)+strlen("/lib/asir-contrib")+1);
+			sprintf(asir_contrib_dir,"%s/lib/asir-contrib",oxhome);
+		} else {
+#if defined(VISUAL)
+			get_rootdir(rootname,sizeof(rootname));
+			asir_contrib_dir = (char *)malloc(strlen(rootname)+strlen("/lib-asir-contrib")+1);
+			sprintf(asir_contrib_dir,"%s/lib-asir-contrib",rootname);
+#else
+			asir_contrib_dir = (char *)malloc(strlen(ASIR_CONTRIB_DIR)+1);
+			strcpy(asir_contrib_dir,ASIR_CONTRIB_DIR);
+#endif
+		}
+	}
+
 	if ( !(asir_pager = getenv("PAGER")) ) {
 		japanese = 0;
 		if ( (e = getenv("LANGUAGE")) && 
@@ -169,9 +194,18 @@ void env_init() {
 			strcpy(asir_pager,MORE);
 		}
 	}
-	if ( e = getenv("ASIRLOADPATH" ) )
+	if ( e = getenv("ASIRLOADPATH" ) ) {
 		for ( i = 0; ; i++, e = p+1 ) {
 			p = (char *)index(e,ENVDELIM);
+			if ( !p )
+				break;
+		}
+		i += 4;
+        ASIRLOADPATH=(char **)MALLOC(sizeof(char *)*i);
+		for ( l = 0; l<i; l++) ASIRLOADPATH[l] = NULL; 
+		e = getenv("ASIRLOADPATH");
+		for ( i = 0; ; i++, e = p+1 ) {
+			p = (char *)index(e,ENVDELIM);
 			l = p ? p-e : strlen(e); q = (char *)MALLOC(l+1);
 			if ( l ) {
 				strncpy(q,e,l); q[l] = 0; ASIRLOADPATH[i] = q;
@@ -179,23 +213,33 @@ void env_init() {
 			if ( !p )
 				break;
 		}
+    }else{
+	  ASIRLOADPATH=(char **)MALLOC(sizeof(char *)*3);
+	  ASIRLOADPATH[0] = NULL;
+	}
+
 	for ( i = 0; ASIRLOADPATH[i]; i++ );
-	ASIRLOADPATH[i] = asir_libdir;
+	if (asir_contrib_dir) ASIRLOADPATH[i++] = asir_contrib_dir;
+	if (asir_libdir) ASIRLOADPATH[i++] = asir_libdir;
+	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)
+	int l,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;
@@ -206,8 +250,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;
 				}
@@ -215,22 +259,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 '/'
@@ -343,33 +371,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;