===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/builtin/file.c,v
retrieving revision 1.5
retrieving revision 1.8
diff -u -p -r1.5 -r1.8
--- OpenXM_contrib2/asir2000/builtin/file.c	2000/08/22 05:03:57	1.5
+++ OpenXM_contrib2/asir2000/builtin/file.c	2000/11/08 08:44:13	1.8
@@ -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.4 2000/08/21 08:31:19 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/builtin/file.c,v 1.7 2000/11/08 06:21:17 noro Exp $ 
 */
 #include "ca.h"
 #include "parse.h"
@@ -70,7 +70,7 @@ void Pload(), Pwhich(), Ploadfiles(), Poutput();
 void Pbsave(), Pbload(), Pbload27();
 void Pbsave_compat(), Pbload_compat();
 void Pbsave_cmo(), Pbload_cmo();
-void Popen_file(), Pclose_file(), Pget_line();
+void Popen_file(), Pclose_file(), Pget_line(), Pget_byte();
 
 extern int des_encryption;
 extern char *asir_libdir;
@@ -78,6 +78,7 @@ extern char *asir_libdir;
 struct ftab file_tab[] = {
 	{"open_file",Popen_file,1},
 	{"close_file",Pclose_file,1},
+	{"get_byte",Pget_byte,1},
 	{"get_line",Pget_line,1},
 	{"remove_file",Premove_file,1},
 	{"access",Paccess,1},
@@ -88,8 +89,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},
@@ -129,7 +132,7 @@ Q *rp;
 {
 	int i;
 
-	asir_assert(ARG0(arg),O_N,"open_file");
+	asir_assert(ARG0(arg),O_N,"close_file");
 	i = QTOS((Q)ARG0(arg));
 	if ( file_ptrs[i] ) {
 		fclose(file_ptrs[i]);
@@ -148,7 +151,7 @@ STRING *rp;
 	fpos_t head;
 	char *str;
 
-	asir_assert(ARG0(arg),O_N,"open_file");
+	asir_assert(ARG0(arg),O_N,"get_line");
 	i = QTOS((Q)ARG0(arg));
 	if ( fp = file_ptrs[i] ) {
 		if ( feof(fp) ) {
@@ -178,6 +181,26 @@ STRING *rp;
 		error("get_line : invalid argument");
 }
 
+void Pget_byte(arg,rp)
+NODE arg;
+Q *rp;
+{
+	int i,c;
+	FILE *fp;
+
+	asir_assert(ARG0(arg),O_N,"get_byte");
+	i = QTOS((Q)ARG0(arg));
+	if ( fp = file_ptrs[i] ) {
+		if ( feof(fp) ) {
+			STOQ(-1,*rp);
+			return;
+		}
+		c = getc(fp);
+		STOQ(c,*rp);
+	} else
+		error("get_byte : invalid argument");
+}
+
 void Pload(arg,rp)
 NODE arg;
 Q *rp;
@@ -372,6 +395,8 @@ Obj *rp;
 	ox_file_io = 0;
 }
 
+static struct oSTRING rootdir;
+
 #if defined(VISUAL)
 void get_rootdir(name,len)
 char *name;
@@ -380,7 +405,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 +420,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 +448,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 +476,7 @@ STRING *rp;
 	*rp = &rootdir;
 }
 
+#if defined(VISUAL) && defined(DES_ENC)
 void Pbsave_enc(arg,rp)
 NODE arg;
 Obj *rp;
@@ -435,6 +496,7 @@ Obj *rp;
 	Pbload(arg,rp);
 	des_encryption = 0;
 }
+#endif
 
 void Pbload27(arg,rp)
 NODE arg;