===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/load.c,v
retrieving revision 1.14
retrieving revision 1.32
diff -u -p -r1.14 -r1.32
--- OpenXM_contrib2/asir2000/parse/load.c	2004/03/18 01:59:41	1.14
+++ OpenXM_contrib2/asir2000/parse/load.c	2017/02/07 08:30:31	1.32
@@ -45,12 +45,12 @@
  * 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.13 2004/03/05 08:45:49 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/parse/load.c,v 1.31 2016/08/30 02:29:11 noro Exp $ 
 */
 #include "ca.h"
 #include "parse.h"
 
-#if defined(VISUAL)
+#if defined(VISUAL) || defined(__MINGW32__)
 #include <string.h>
 #include <fcntl.h>
 #include <sys/stat.h>
@@ -70,18 +70,19 @@
 #include <unistd.h>
 #endif
 
-#if defined(VISUAL)
+#if defined(VISUAL) || defined(__MINGW32__)
 #include <io.h>
 #endif
 
 #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;
+int ASIRLOADPATH_LEN;
 
-#if defined(VISUAL)
+#if defined(VISUAL) || defined(__MINGW32__)
 #define ENVDELIM ';'
 #define MORE "more < "
 #else
@@ -90,16 +91,20 @@ 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_private_dir;
 extern char *asir_pager;
-extern int read_exec_file;
 extern int main_parser;
 extern JMP_BUF exec_env;
 
@@ -121,7 +126,7 @@ char *search_executable(char *name)
 		if ( len+nlen+1 >= BUFSIZ ) continue;
 		sprintf(path,"%s/%s",dir,name);
 		if ( !stat(path,&buf) && !(buf.st_mode & S_IFDIR) 
-#if !defined(VISUAL)
+#if !defined(VISUAL) && !defined(__MINGW32__)
 			&& !access(path,X_OK)
 #endif
                 ) {
@@ -140,23 +145,48 @@ void env_init() {
 	char *getenv();
 	char *oxhome;
 	char rootname[BUFSIZ];
+    size_t len;
 
+	if ( oxhome = getenv("OpenXM_HOME") ) {
+		len = strlen(oxhome);
+	}else {
+#if defined(VISUAL) || defined(__MINGW32__)
+		get_rootdir(rootname,sizeof(rootname));
+		len = strlen(rootname);
+		oxhome = rootname;
+#endif
+	}
+
 	if ( !(asir_libdir = getenv("ASIR_LIBDIR")) ) {
-		if ( oxhome = getenv("OpenXM_HOME") ) {
-			asir_libdir = (char *)malloc(strlen(oxhome)+strlen("/lib/asir")+1);
+		if ( oxhome ) {
+			asir_libdir = (char *)malloc(len+strlen("/lib/asir")+1);
 			sprintf(asir_libdir,"%s/lib/asir",oxhome);
 		} else {
-#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);
-#endif
 		}
 	}
+
+	if ( !(asir_contrib_dir = getenv("ASIR_CONTRIB_DIR")) ) {
+		if ( oxhome ) {
+			asir_contrib_dir = (char *)malloc(len+strlen("/lib/asir-contrib")+1);
+			sprintf(asir_contrib_dir,"%s/lib/asir-contrib",oxhome);
+		} else {
+			asir_contrib_dir = (char *)malloc(strlen(ASIR_CONTRIB_DIR)+1);
+			strcpy(asir_contrib_dir,ASIR_CONTRIB_DIR);
+		}
+	}
+
+    asir_private_dir = NULL;
+#if defined(VISUAL) || defined(__MINGW32__)
+    if ( e = getenv("APPDATA") ) {
+        asir_private_dir = (char *)malloc(strlen(e)+strlen("/OpenXM/lib/asir-contrib")+1);
+        sprintf(asir_private_dir,"%s/OpenXM/lib/asir-contrib",e);
+    }
+#endif  
+
 	if ( !(asir_pager = getenv("PAGER")) ) {
+#if 0
 		japanese = 0;
 		if ( (e = getenv("LANGUAGE")) && 
 			(!strncmp(e,"japan",5) || !strncmp(e,"ja_JP",5)) ) japanese = 1;
@@ -168,15 +198,27 @@ void env_init() {
 			(!strncmp(e,"japan",5) || !strncmp(e,"ja_JP",5)) ) japanese = 1;
 		if ( japanese )
 			asir_pager = search_executable("jless");
+#endif
+		asir_pager = search_executable("less");
 		if ( !asir_pager ) {
 			/* default: more */
 			asir_pager = (char *)malloc(strlen(MORE)+1);
 			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 += 5;
+		ASIRLOADPATH_LEN=i;
+        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;
@@ -184,23 +226,36 @@ 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_private_dir) ASIRLOADPATH[i++] = asir_private_dir;
+	if (asir_contrib_dir) ASIRLOADPATH[i++] = asir_contrib_dir;
+	if (asir_libdir) ASIRLOADPATH[i++] = asir_libdir;
+	ASIRLOADPATH[i++] = ".";
+	ASIRLOADPATH[i] = NULL;
 }
 
+#if defined(VISUAL) || defined(__MINGW32__)
+#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;
@@ -211,8 +266,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;
 				}
@@ -220,22 +275,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 '/'
@@ -245,7 +284,7 @@ void loadasirfile(char *name0)
 	FILE *in;
 	INFILE t;
 	extern char cppname[];
-#if defined(VISUAL)
+#if defined(VISUAL) || defined(__MINGW32__)
 	char ibuf1[BUFSIZ],ibuf2[BUFSIZ];
 	int ac;
 	char *av[BUFSIZ];
@@ -330,7 +369,7 @@ void loadasirfile(char *name0)
 #else
 	char com[BUFSIZ];
 
-	sprintf(com,"%s -I%s %s",cppname,asir_libdir,name0); in = popen(com,"r");
+	sprintf(com,"%s -I%s -D__FILE__=%s %s",cppname,asir_libdir,name0,name0); in = popen(com,"r");
 	if ( !in ) {
 		perror("popen");
 		error("load : failed");
@@ -342,39 +381,17 @@ void loadasirfile(char *name0)
 	main_parser = 1; /* XXX */
 	Eungetc(afternl(),asir_infile->fp);
 	if ( !EPVS->va )
-		reallocarray((char **)&EPVS->va,(int *)&EPVS->asize,(int *)&EPVS->n,(int)sizeof(struct oPV));
+		asir_reallocarray((char **)&EPVS->va,(int *)&EPVS->asize,(int *)&EPVS->n,(int)sizeof(struct oPV));
 }
 
 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;