===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/builtin/file.c,v
retrieving revision 1.10
retrieving revision 1.13
diff -u -p -r1.10 -r1.13
--- OpenXM_contrib2/asir2000/builtin/file.c	2000/11/13 01:48:12	1.10
+++ OpenXM_contrib2/asir2000/builtin/file.c	2001/03/21 23:49:34	1.13
@@ -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.9 2000/11/10 08:28:52 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/builtin/file.c,v 1.12 2000/12/06 00:54:09 noro Exp $ 
 */
 #include "ca.h"
 #include "parse.h"
@@ -71,7 +71,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(), Pget_byte();
+void Popen_file(), Pclose_file(), Pget_line(), Pget_byte(), Pput_byte();
 void Ppurge_stdin();
 
 extern int des_encryption;
@@ -79,9 +79,10 @@ extern char *asir_libdir;
 
 struct ftab file_tab[] = {
 	{"purge_stdin",Ppurge_stdin,0},
-	{"open_file",Popen_file,1},
+	{"open_file",Popen_file,-2},
 	{"close_file",Pclose_file,1},
 	{"get_byte",Pget_byte,1},
+	{"put_byte",Pput_byte,2},
 	{"get_line",Pget_line,-1},
 	{"remove_file",Premove_file,1},
 	{"access",Paccess,1},
@@ -127,9 +128,13 @@ Q *rp;
 	if ( i == BUFSIZ )
 		error("open_file : too many open files");
 	name = BDY((STRING)ARG0(arg));
-	fp = fopen(name,"r");
+	if ( argc(arg) == 2 ) {
+		asir_assert(ARG1(arg),O_STR,"open_file");
+		fp = fopen(name,BDY((STRING)ARG1(arg)));
+	} else
+		fp = fopen(name,"r");
 	if ( !fp ) {
-		sprintf(errbuf,"open_file : \"%s\" not found",name);
+		sprintf(errbuf,"open_file : cannot open \"%s\"",name);
 		error(errbuf);
 	}
 	file_ptrs[i] = fp;
@@ -225,6 +230,24 @@ Q *rp;
 		error("get_byte : invalid argument");
 }
 
+void Pput_byte(arg,rp)
+NODE arg;
+Q *rp;
+{
+	int i,c;
+	FILE *fp;
+
+	asir_assert(ARG0(arg),O_N,"put_byte");
+	asir_assert(ARG1(arg),O_N,"put_byte");
+	i = QTOS((Q)ARG0(arg));
+	c = QTOS((Q)ARG1(arg));
+	if ( fp = file_ptrs[i] ) {
+		putc(c,fp);
+		STOQ(c,*rp);
+	} else
+		error("put_byte : invalid argument");
+}
+
 void Pload(arg,rp)
 NODE arg;
 Q *rp;
@@ -233,11 +256,6 @@ Q *rp;
 	char *name,*name0;
 	char errbuf[BUFSIZ];
 
-#if defined THINK_C
-	if ( !arg ) {
-		ret = finder_loadfile();
-	} else
-#endif
 	if ( ARG0(arg) ) {
 		switch (OID(ARG0(arg))) {
 			case O_STR:
@@ -341,11 +359,7 @@ Q *rp;
 	for ( t = vl; t; t = NEXT(t) )
 		if ( t->v->attr == (pointer)V_UC )
 			error("bsave : not implemented");
-#if defined(THINK_C) || defined(VISUAL)
 	fp = fopen(BDY((STRING)ARG1(arg)),"wb");
-#else
-	fp = fopen(BDY((STRING)ARG1(arg)),"w");
-#endif
 	if ( !fp )
 		error("bsave : invalid filename");
 	ox_file_io = 1; /* network byte order is used */
@@ -363,11 +377,7 @@ Obj *rp;
 	FILE *fp;
 
 	asir_assert(ARG0(arg),O_STR,"bload");
-#if defined(THINK_C) || defined(VISUAL)
 	fp = fopen(BDY((STRING)ARG0(arg)),"rb");
-#else
-	fp = fopen(BDY((STRING)ARG0(arg)),"r");
-#endif
 	if ( !fp )
 		error("bload : invalid filename");
 	ox_file_io = 1; /* network byte order is used */
@@ -385,11 +395,7 @@ Q *rp;
 	VL vl,t;
 
 	asir_assert(ARG1(arg),O_STR,"bsave_cmo");
-#if defined(THINK_C) || defined(VISUAL)
 	fp = fopen(BDY((STRING)ARG1(arg)),"wb");
-#else
-	fp = fopen(BDY((STRING)ARG1(arg)),"w");
-#endif
 	if ( !fp )
 		error("bsave_cmo : invalid filename");
 	ox_file_io = 1; /* network byte order is used */
@@ -406,11 +412,7 @@ Obj *rp;
 	FILE *fp;
 
 	asir_assert(ARG0(arg),O_STR,"bload_cmo");
-#if defined(THINK_C) || defined(VISUAL)
 	fp = fopen(BDY((STRING)ARG0(arg)),"rb");
-#else
-	fp = fopen(BDY((STRING)ARG0(arg)),"r");
-#endif
 	if ( !fp )
 		error("bload_cmo : invalid filename");
 	ox_file_io = 1; /* network byte order is used */
@@ -430,11 +432,19 @@ int len;
 	HKEY	hOpenKey;
 	DWORD	Type;
 	char	*slash;
-		
+
 	if ( rootdir.body ) {
 		strcpy(name,rootdir.body);
 		return;
 	}
+
+	if ( access("UseCurrentDir",0) >= 0 ) {
+		GetCurrentDirectory(BUFSIZ,name);
+		slash = strrchr(name,'\\');
+		if ( slash )
+			*slash = 0;
+		return;
+	}
 	name[0] = 0;
 	ret = RegOpenKeyEx(HKEY_LOCAL_MACHINE, ECGEN_KEYNAME, 0,
 		KEY_QUERY_VALUE, &hOpenKey);
@@ -530,11 +540,7 @@ Obj *rp;
 	Obj r;
 
 	asir_assert(ARG0(arg),O_STR,"bload27");
-#if defined(THINK_C) || defined(VISUAL)
 	fp = fopen(BDY((STRING)ARG0(arg)),"rb");
-#else
-	fp = fopen(BDY((STRING)ARG0(arg)),"r");
-#endif
 	if ( !fp )
 		error("bload : invalid filename");
 	loadvl(fp);
@@ -555,11 +561,7 @@ Q *rp;
 	for ( t = vl; t; t = NEXT(t) )
 		if ( t->v->attr == (pointer)V_UC )
 			error("bsave : not implemented");
-#if defined(THINK_C) || defined(VISUAL)
 	fp = fopen(BDY((STRING)ARG1(arg)),"wb");
-#else
-	fp = fopen(BDY((STRING)ARG1(arg)),"w");
-#endif
 	if ( !fp )
 		error("bsave : invalid filename");
 	/* indicator of an asir32 file */
@@ -580,11 +582,7 @@ Obj *rp;
 	int c;
 
 	asir_assert(ARG0(arg),O_STR,"bload_compat");
-#if defined(THINK_C) || defined(VISUAL)
 	fp = fopen(BDY((STRING)ARG0(arg)),"rb");
-#else
-	fp = fopen(BDY((STRING)ARG0(arg)),"r");
-#endif
 	if ( !fp )
 		error("bload : invalid filename");
 	fread(hdr,sizeof(unsigned int),2,fp);