===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/builtin/file.c,v
retrieving revision 1.9
retrieving revision 1.16
diff -u -p -r1.9 -r1.16
--- OpenXM_contrib2/asir2000/builtin/file.c	2000/11/10 08:28:52	1.9
+++ OpenXM_contrib2/asir2000/builtin/file.c	2002/10/01 09:58:48	1.16
@@ -45,12 +45,15 @@
  * 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.8 2000/11/08 08:44:13 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/builtin/file.c,v 1.15 2001/10/09 01:36:05 noro Exp $ 
 */
 #include "ca.h"
 #include "parse.h"
+#include "ox.h"
 #include "base.h"
+#if !defined(VISUAL)
 #include "unistd.h"
+#endif
 #if PARI
 #include "genpari.h"
 #endif
@@ -58,6 +61,7 @@
 #if defined(VISUAL)
 #include <windows.h>
 #include <process.h>
+#include <io.h>
 /* #define ECGEN_KEYNAME "SoftWare\\Fujitsu\\WinECgen\\1.00.000" */
 #define ECGEN_KEYNAME "SoftWare\\Fujitsu\\FSEcParamGen\\V1.0L10"
 #define ASIR_KEYNAME "SoftWare\\Fujitsu\\Asir\\1999.03.31"
@@ -71,19 +75,24 @@ 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();
+void Pload_exec();
 
 extern int des_encryption;
 extern char *asir_libdir;
 
 struct ftab file_tab[] = {
-	{"open_file",Popen_file,1},
+	{"purge_stdin",Ppurge_stdin,0},
+	{"open_file",Popen_file,-2},
 	{"close_file",Pclose_file,1},
 	{"get_byte",Pget_byte,1},
-	{"get_line",Pget_line,1},
+	{"put_byte",Pput_byte,2},
+	{"get_line",Pget_line,-1},
 	{"remove_file",Premove_file,1},
 	{"access",Paccess,1},
 	{"load",Pload,-1},
+	{"load_exec",Pload_exec,1},
 	{"which",Pwhich,1},
 	{"loadfiles",Ploadfiles,1},
 	{"output",Poutput,-1},
@@ -104,10 +113,14 @@ struct ftab file_tab[] = {
 
 static FILE *file_ptrs[BUFSIZ];
 
-void Popen_file(arg,rp)
-NODE arg;
-Q *rp;
+void Ppurge_stdin(Q *rp)
 {
+	purge_stdin(stdin);
+	*rp = 0;
+}
+
+void Popen_file(NODE arg,Q *rp)
+{
 	char *name;
 	FILE *fp;
 	char errbuf[BUFSIZ];
@@ -118,18 +131,20 @@ 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;
 	STOQ(i,*rp);
 }
 
-void Pclose_file(arg,rp)
-NODE arg;
-Q *rp;
+void Pclose_file(NODE arg,Q *rp)
 {
 	int i;
 
@@ -143,15 +158,27 @@ Q *rp;
 	*rp = ONE;
 }
 
-void Pget_line(arg,rp)
-NODE arg;
-STRING *rp;
+void Pget_line(NODE arg,STRING *rp)
 {
 	int i,j,c;
 	FILE *fp;
 	fpos_t head;
 	char *str;
+	char buf[BUFSIZ];
 
+	if ( !arg ) {
+#if defined(VISUAL_LIB)
+		get_string(buf,sizeof(buf));
+#else
+		fgets(buf,sizeof(buf),stdin);
+#endif
+		i = strlen(buf);
+		str = (char *)MALLOC_ATOMIC(i+1);	
+		strcpy(str,buf);
+		MKSTR(*rp,str);
+		return;
+	}
+
 	asir_assert(ARG0(arg),O_N,"get_line");
 	i = QTOS((Q)ARG0(arg));
 	if ( fp = file_ptrs[i] ) {
@@ -182,9 +209,7 @@ STRING *rp;
 		error("get_line : invalid argument");
 }
 
-void Pget_byte(arg,rp)
-NODE arg;
-Q *rp;
+void Pget_byte(NODE arg,Q *rp)
 {
 	int i,c;
 	FILE *fp;
@@ -202,19 +227,28 @@ Q *rp;
 		error("get_byte : invalid argument");
 }
 
-void Pload(arg,rp)
-NODE arg;
-Q *rp;
+void Pput_byte(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(NODE arg,Q *rp)
+{
 	int ret = 0;
 	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:
@@ -238,10 +272,24 @@ Q *rp;
 	STOQ(ret,*rp);
 }
 
-void Pwhich(arg,rp)
-NODE arg;
-STRING *rp;
+void Pload_exec(NODE arg,Q *rp)
 {
+	int ret;
+	char *name0,*name;
+
+	name0 = BDY((STRING)ARG0(arg));
+	searchasirpath(name0,&name);
+	if ( !name )
+		ret = -1;
+	else {
+		load_and_execfile(name);
+		ret = 0;
+	}
+	STOQ(ret,*rp);
+}
+
+void Pwhich(NODE arg,STRING *rp)
+{
 	char *name;
 	STRING str;
 
@@ -259,9 +307,7 @@ STRING *rp;
 		*rp = 0;
 }
 
-void Ploadfiles(arg,rp)
-NODE arg;
-Q *rp;
+void Ploadfiles(NODE arg,Q *rp)
 {
 	int ret;
 
@@ -275,9 +321,7 @@ Q *rp;
 	STOQ(ret,*rp);
 }
 
-void Poutput(arg,rp)
-NODE arg;
-Q *rp;
+void Poutput(NODE arg,Q *rp)
 {
 #if PARI
 	extern FILE *outfile;
@@ -306,9 +350,7 @@ Q *rp;
 
 extern int ox_file_io;
 
-void Pbsave(arg,rp)
-NODE arg;
-Q *rp;
+void Pbsave(NODE arg,Q *rp)
 {
 	FILE *fp;
 	VL vl,t;
@@ -318,11 +360,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 */
@@ -333,18 +371,12 @@ Q *rp;
 	*rp = ONE;
 }
 
-void Pbload(arg,rp)
-NODE arg;
-Obj *rp;
+void Pbload(NODE arg,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 */
@@ -354,19 +386,12 @@ Obj *rp;
 	ox_file_io = 0;
 }
 
-void Pbsave_cmo(arg,rp)
-NODE arg;
-Q *rp;
+void Pbsave_cmo(NODE arg,Q *rp)
 {
 	FILE *fp;
-	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 */
@@ -376,18 +401,12 @@ Q *rp;
 	*rp = ONE;
 }
 
-void Pbload_cmo(arg,rp)
-NODE arg;
-Obj *rp;
+void Pbload_cmo(NODE arg,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 */
@@ -399,19 +418,25 @@ Obj *rp;
 static struct oSTRING rootdir;
 
 #if defined(VISUAL)
-void get_rootdir(name,len)
-char *name;
-int len;
+void get_rootdir(char *name,int len)
 {
 	LONG	ret;
 	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);
@@ -429,8 +454,7 @@ int len;
 	}
 }
 
-void set_rootdir(name)
-char *name;
+void set_rootdir(char *name)
 {
 	static char DirName[BUFSIZ];
 
@@ -443,15 +467,12 @@ char *name;
 }
 
 #else
-void get_rootdir(name,len)
-char *name;
-int len;
+void get_rootdir(char *name,int len)
 {
 	strcpy(name,asir_libdir);
 }
 
-void set_rootdir(name)
-char *name;
+void set_rootdir(char *name)
 {
 	static char DirName[BUFSIZ];
 
@@ -463,11 +484,9 @@ char *name;
 
 #endif
 
-void Pget_rootdir(rp)
-STRING *rp;
+void Pget_rootdir(STRING *rp)
 {
 	static char DirName[BUFSIZ];
-	int DirNameLen;
 
 	if ( !rootdir.body ) {
 		get_rootdir(DirName,sizeof(DirName));
@@ -478,9 +497,7 @@ STRING *rp;
 }
 
 #if defined(VISUAL) && defined(DES_ENC)
-void Pbsave_enc(arg,rp)
-NODE arg;
-Obj *rp;
+void Pbsave_enc(NODE arg,Obj *rp)
 {
 	init_deskey();
 	des_encryption = 1;
@@ -488,9 +505,7 @@ Obj *rp;
 	des_encryption = 0;
 }
 
-void Pbload_enc(arg,rp)
-NODE arg;
-Obj *rp;
+void Pbload_enc(NODE arg,Obj *rp)
 {
 	init_deskey();
 	des_encryption = 1;
@@ -499,19 +514,13 @@ Obj *rp;
 }
 #endif
 
-void Pbload27(arg,rp)
-NODE arg;
-Obj *rp;
+void Pbload27(NODE arg,Obj *rp)
 {
 	FILE *fp;
 	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);
@@ -520,9 +529,7 @@ Obj *rp;
 	bobjtoobj(BASE27,r,rp);
 }
 
-void Pbsave_compat(arg,rp)
-NODE arg;
-Q *rp;
+void Pbsave_compat(NODE arg,Q *rp)
 {
 	FILE *fp;
 	VL vl,t;
@@ -532,11 +539,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 */
@@ -547,9 +550,7 @@ Q *rp;
 	*rp = ONE;
 }
 
-void Pbload_compat(arg,rp)
-NODE arg;
-Obj *rp;
+void Pbload_compat(NODE arg,Obj *rp)
 {
 	FILE *fp;
 	unsigned int hdr[2];
@@ -557,11 +558,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);
@@ -587,21 +584,14 @@ Obj *rp;
 	fclose(fp);
 }
 
-void Premove_file(arg,rp)
-NODE arg;
-Q *rp;
+void Premove_file(NODE arg,Q *rp)
 {
 	unlink((char *)BDY((STRING)ARG0(arg)));
 	*rp = ONE;
 }
 
-void Paccess(arg,rp)
-NODE arg;
-Q *rp;
+void Paccess(NODE arg,Q *rp)
 {
-	char *name;
-	STRING str;
-
 #if defined(VISUAL)
 	if ( access(BDY((STRING)ARG0(arg)),04) >= 0 )
 #else
@@ -618,9 +608,7 @@ int process_id()
 	return GetCurrentProcessId();
 }
 
-void call_exe(name,av)
-char *name;
-char **av;
+void call_exe(char *name,char **av)
 {
 	_spawnv(_P_WAIT,name,av);
 }