===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/builtin/file.c,v
retrieving revision 1.4
retrieving revision 1.7
diff -u -p -r1.4 -r1.7
--- OpenXM_contrib2/asir2000/builtin/file.c	2000/08/21 08:31:19	1.4
+++ OpenXM_contrib2/asir2000/builtin/file.c	2000/11/08 06:21:17	1.7
@@ -23,7 +23,7 @@
  * shall be made on your publication or presentation in any form of the
  * results obtained by use of the SOFTWARE.
  * (4) In the event that you modify the SOFTWARE, you shall notify FLL by
- * e-mail at risa-admin@flab.fujitsu.co.jp of the detailed specification
+ * e-mail at risa-admin@sec.flab.fujitsu.co.jp of the detailed specification
  * for such modification or the source code of the modified part of the
  * SOFTWARE.
  * 
@@ -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.3 2000/03/02 07:16:09 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/builtin/file.c,v 1.6 2000/08/25 08:06:19 noro Exp $ 
 */
 #include "ca.h"
 #include "parse.h"
@@ -88,8 +88,10 @@ struct ftab file_tab[] = {
 	{"bsave",Pbsave,2},
 	{"bload",Pbload,1},
 	{"get_rootdir",Pget_rootdir,0},
+#if defined(VISUAL) && defined(DES_ENC)
 	{"bsave_enc",Pbsave_enc,2},
 	{"bload_enc",Pbload_enc,1},
+#endif
 	{"bload27",Pbload27,1},
 	{"bsave_compat",Pbsave_compat,2},
 	{"bload_compat",Pbload_compat,1},
@@ -372,6 +374,8 @@ Obj *rp;
 	ox_file_io = 0;
 }
 
+static struct oSTRING rootdir;
+
 #if defined(VISUAL)
 void get_rootdir(name,len)
 char *name;
@@ -380,7 +384,12 @@ int len;
 	LONG	ret;
 	HKEY	hOpenKey;
 	DWORD	Type;
+	char	*slash;
 		
+	if ( rootdir.body ) {
+		strcpy(name,rootdir.body);
+		return;
+	}
 	name[0] = 0;
 	ret = RegOpenKeyEx(HKEY_LOCAL_MACHINE, ECGEN_KEYNAME, 0,
 		KEY_QUERY_VALUE, &hOpenKey);
@@ -390,8 +399,27 @@ int len;
 	if( ret == ERROR_SUCCESS ) {
 		RegQueryValueEx(hOpenKey, "Directory", NULL, &Type, name, &len);
 		RegCloseKey(hOpenKey);
+	} else {
+		GetCurrentDirectory(len,name);
+		slash = strrchr(name,'\\');
+		if ( slash )
+			*slash = 0;
 	}
 }
+
+void set_rootdir(name)
+char *name;
+{
+	static char DirName[BUFSIZ];
+
+	strcpy(DirName,name);
+	rootdir.id = O_STR;
+	rootdir.body = DirName;
+	asir_libdir = DirName;
+	/* XXX */
+	env_init();
+}
+
 #else
 void get_rootdir(name,len)
 char *name;
@@ -399,12 +427,23 @@ int len;
 {
 	strcpy(name,asir_libdir);
 }
+
+void set_rootdir(name)
+char *name;
+{
+	static char DirName[BUFSIZ];
+
+	strcpy(DirName,name);
+	asir_libdir = DirName;
+	/* XXX */
+	env_init();
+}
+
 #endif
 
 void Pget_rootdir(rp)
 STRING *rp;
 {
-	static struct oSTRING rootdir;
 	static char DirName[BUFSIZ];
 	int DirNameLen;
 
@@ -416,6 +455,7 @@ STRING *rp;
 	*rp = &rootdir;
 }
 
+#if defined(VISUAL) && defined(DES_ENC)
 void Pbsave_enc(arg,rp)
 NODE arg;
 Obj *rp;
@@ -435,6 +475,7 @@ Obj *rp;
 	Pbload(arg,rp);
 	des_encryption = 0;
 }
+#endif
 
 void Pbload27(arg,rp)
 NODE arg;