===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/load.c,v
retrieving revision 1.10
retrieving revision 1.16
diff -u -p -r1.10 -r1.16
--- OpenXM_contrib2/asir2000/parse/load.c	2004/03/02 07:44:02	1.10
+++ OpenXM_contrib2/asir2000/parse/load.c	2005/03/24 22:54:22	1.16
@@ -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.9 2001/12/25 02:39:06 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/parse/load.c,v 1.15 2005/03/24 12:46:45 takayama Exp $ 
 */
 #include "ca.h"
 #include "parse.h"
@@ -79,7 +79,7 @@
 #define MALLOC(x) GC_malloc((x)+4)
 #endif
 
-char *ASIRLOADPATH[32];
+char **ASIRLOADPATH;
 
 #if defined(VISUAL)
 #define ENVDELIM ';'
@@ -106,21 +106,25 @@ extern JMP_BUF exec_env;
 char *search_executable(char *name)
 {
 	char *c,*s,*ret;
-	int len;
+	int len,nlen;
 	char dir[BUFSIZ],path[BUFSIZ];
 	struct stat buf;
 
+	nlen = strlen(name);
 	for ( s = (char *)getenv("PATH"); s; ) {
 		c = (char *)index(s,':');
-		if ( c ) {
-			len = c-s;
-			strncpy(dir,s,len); s = c+1; dir[len] = 0;
-		} else {
-			strcpy(dir,s); s = 0;
-		}
+		len = c ? c-s : strlen(s);
+		if ( len >= BUFSIZ ) continue;
+		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);
@@ -154,10 +158,14 @@ void env_init() {
 	}
 	if ( !(asir_pager = getenv("PAGER")) ) {
 		japanese = 0;
-		if ( (e = getenv("LANGUAGE")) && strstr(e,"ja") ) japanese = 1;
-		else if ( (e = getenv("LC_ALL")) && strstr(e,"ja") ) japanese = 1;
-		else if ( (e = getenv("LC_CTYPE")) && strstr(e,"ja") ) japanese = 1;
-		else if ( (e = getenv("LANG")) && strstr(e,"ja") ) japanese = 1;
+		if ( (e = getenv("LANGUAGE")) && 
+			(!strncmp(e,"japan",5) || !strncmp(e,"ja_JP",5)) ) japanese = 1;
+		else if ( (e = getenv("LC_ALL")) && 
+			(!strncmp(e,"japan",5) || !strncmp(e,"ja_JP",5)) ) japanese = 1;
+		else if ( (e = getenv("LC_CTYPE")) && 
+			(!strncmp(e,"japan",5) || !strncmp(e,"ja_JP",5)) ) japanese = 1;
+		else if ( (e = getenv("LANG")) && 
+			(!strncmp(e,"japan",5) || !strncmp(e,"ja_JP",5)) ) japanese = 1;
 		if ( japanese )
 			asir_pager = search_executable("jless");
 		if ( !asir_pager ) {
@@ -166,9 +174,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 += 3;
+        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;
@@ -176,8 +193,13 @@ 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;
+	ASIRLOADPATH[i++] = asir_libdir;
+	ASIRLOADPATH[i] = NULL;
 }
 
 void searchasirpath(char *name,char **pathp)