===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/load.c,v
retrieving revision 1.11
retrieving revision 1.15
diff -u -p -r1.11 -r1.15
--- OpenXM_contrib2/asir2000/parse/load.c	2004/03/02 08:28:49	1.11
+++ OpenXM_contrib2/asir2000/parse/load.c	2005/03/24 12:46:45	1.15
@@ -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.14 2004/03/18 01:59:41 noro 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 ';'
@@ -111,15 +111,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);
@@ -169,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 += 2;
+        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,6 +193,7 @@ void env_init() {
 			if ( !p )
 				break;
 		}
+    }
 	for ( i = 0; ASIRLOADPATH[i]; i++ );
 	ASIRLOADPATH[i] = asir_libdir;
 }