===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/load.c,v
retrieving revision 1.17
retrieving revision 1.19
diff -u -p -r1.17 -r1.19
--- OpenXM_contrib2/asir2000/parse/load.c	2005/03/24 23:40:50	1.17
+++ 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.16 2005/03/24 22:54:22 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"
@@ -153,6 +153,7 @@ void env_init() {
 #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);
@@ -399,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;