===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/load.c,v
retrieving revision 1.16
retrieving revision 1.19
diff -u -p -r1.16 -r1.19
--- OpenXM_contrib2/asir2000/parse/load.c	2005/03/24 22:54:22	1.16
+++ OpenXM_contrib2/asir2000/parse/load.c	2006/02/05 08:28:04	1.19
@@ -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.15 2005/03/24 12:46:45 takayama Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/parse/load.c,v 1.18 2005/03/28 09:20:38 noro Exp $ 
 */
 #include "ca.h"
 #include "parse.h"
@@ -90,14 +90,18 @@ char **ASIRLOADPATH;
 #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;
@@ -156,6 +160,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")) && 
@@ -180,7 +201,7 @@ void env_init() {
 			if ( !p )
 				break;
 		}
-		i += 3;
+		i += 4;
         ASIRLOADPATH=(char **)MALLOC(sizeof(char *)*i);
 		for ( l = 0; l<i; l++) ASIRLOADPATH[l] = NULL; 
 		e = getenv("ASIRLOADPATH");
@@ -196,9 +217,11 @@ void env_init() {
     }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;
 }
 
@@ -377,15 +400,14 @@ void load_and_execfile(char *name)
 	savepvs();
 	save_asir_infile = asir_infile;
 	save_prresult = prresult;
-	fp = fopen(name,"rb");
-	input_init(fp,name);
+	asir_infile = 0;
+	loadasirfile(name);
 	if ( !SETJMP(exec_env) ) {
 		/* XXX : information for asir_teriminate() */
 		read_exec_file = 2;
 		read_eval_loop();
 		read_exec_file = 0;
 	}
-	fclose(fp);
 	restorepvs();
 	asir_infile = save_asir_infile;
 	prresult = save_prresult;