===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/load.c,v
retrieving revision 1.22
retrieving revision 1.26
diff -u -p -r1.22 -r1.26
--- OpenXM_contrib2/asir2000/parse/load.c	2012/12/17 07:20:45	1.22
+++ OpenXM_contrib2/asir2000/parse/load.c	2014/05/09 18:32:13	1.26
@@ -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.21 2006/09/13 02:26:13 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/parse/load.c,v 1.25 2014/04/02 22:08:29 ohara Exp $ 
 */
 #include "ca.h"
 #include "parse.h"
@@ -102,6 +102,7 @@ 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 main_parser;
 extern JMP_BUF exec_env;
@@ -143,39 +144,46 @@ 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)
+		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 = getenv("OpenXM_HOME") ) {
-			asir_contrib_dir = (char *)malloc(strlen(oxhome)+strlen("/lib/asir-contrib")+1);
+		if ( oxhome ) {
+			asir_contrib_dir = (char *)malloc(len+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
 		}
 	}
 
+    asir_private_dir = NULL;
+#if defined(VISUAL)
+    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")) ) {
 		japanese = 0;
 		if ( (e = getenv("LANGUAGE")) && 
@@ -219,8 +227,10 @@ void env_init() {
 	}
 
 	for ( i = 0; ASIRLOADPATH[i]; i++ );
+	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;
 }
 
@@ -232,7 +242,8 @@ void searchasirpath(char *name,char **pathp)
 {
 	char **p;
 	char *q;
-	int l,ret;
+	size_t l;
+	int ret;
 	struct stat sbuf;
 	
 	if ( (name[0] == '/') || ( name[0] == '.') || strchr(name,':')