===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/builtin/file.c,v
retrieving revision 1.27
retrieving revision 1.30
diff -u -p -r1.27 -r1.30
--- OpenXM_contrib2/asir2000/builtin/file.c	2009/03/13 04:45:15	1.27
+++ OpenXM_contrib2/asir2000/builtin/file.c	2014/04/02 22:08:29	1.30
@@ -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/builtin/file.c,v 1.26 2008/11/19 13:12:43 ohara Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/builtin/file.c,v 1.29 2013/08/20 14:22:33 ohara Exp $ 
 */
 #include "ca.h"
 #include "parse.h"
@@ -69,6 +69,7 @@
 #endif
 
 void Pget_rootdir();
+void Pget_asirloadpath();
 void Paccess(),Premove_file();
 void Pbsave_enc(), Pbload_enc();
 
@@ -81,9 +82,11 @@ void Pput_word(), Pget_word();
 void Ppurge_stdin();
 void Pfprintf();
 void Pimport();
+void Pgetpid();
 
 extern int des_encryption;
 extern char *asir_libdir;
+extern char **ASIRLOADPATH;
 
 struct ftab file_tab[] = {
 	{"fprintf",Pfprintf,-99999999},
@@ -105,6 +108,7 @@ struct ftab file_tab[] = {
 	{"bsave",Pbsave,2},
 	{"bload",Pbload,1},
 	{"get_rootdir",Pget_rootdir,0},
+	{"get_asirloadpath",Pget_asirloadpath,0},
 #if defined(DES_ENC)
 	{"bsave_enc",Pbsave_enc,2},
 	{"bload_enc",Pbload_enc,1},
@@ -114,6 +118,7 @@ struct ftab file_tab[] = {
 	{"bload_compat",Pbload_compat,1},
 	{"bsave_cmo",Pbsave_cmo,2},
 	{"bload_cmo",Pbload_cmo,1},
+	{"getpid",Pgetpid,0},
 	{0,0,0},
 };
 
@@ -516,11 +521,11 @@ void get_rootdir(char *name,int len)
 		strcpy(name,rootdir.body);
 		return;
 	}
-
-	if ( access("UseCurrentDir",0) >= 0 ) {
-		GetCurrentDirectory(BUFSIZ,name);
+	if ( GetModuleFileName(NULL,name,BUFSIZ) ) {
 		slash = strrchr(name,'\\');
-		if ( slash )
+		*slash = 0;
+		slash = strrchr(name,'\\');
+		if ( slash ) 
 			*slash = 0;
 		return;
 	}
@@ -581,6 +586,37 @@ void Pget_rootdir(STRING *rp)
 		rootdir.body = DirName;
 	}
 	*rp = &rootdir;
+}
+
+void Pget_asirloadpath(LIST *rp)
+{
+    STRING s;
+    int i;
+    NODE t,prev;
+    if( ASIRLOADPATH[0] == NULL ) {
+        *rp = NULL;
+        return;
+    }
+    for(i=0; ASIRLOADPATH[i]; i++) {
+    }
+    for(t=0,i--; i>=0; i--) {
+        prev=t;
+        MKSTR(s,ASIRLOADPATH[i]);
+        MKNODE(t,s,prev);
+    }
+    MKLIST(*rp,t);
+}
+
+void Pgetpid(Q *rp)
+{
+	int id;
+
+#if defined(VISUAL)
+	id = GetCurrentProcessId();
+#else
+	id = getpid();
+#endif
+	STOQ(id,*rp);
 }
 
 #if defined(DES_ENC)