===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/builtin/file.c,v
retrieving revision 1.11
retrieving revision 1.31
diff -u -p -r1.11 -r1.31
--- OpenXM_contrib2/asir2000/builtin/file.c	2000/12/05 01:24:50	1.11
+++ OpenXM_contrib2/asir2000/builtin/file.c	2014/05/12 02:27:49	1.31
@@ -45,22 +45,27 @@
  * 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.10 2000/11/13 01:48:12 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/builtin/file.c,v 1.30 2014/04/02 22:08:29 ohara Exp $ 
 */
 #include "ca.h"
 #include "parse.h"
+#include "ox.h"
 #include "base.h"
+#if !defined(VISUAL)
 #include "unistd.h"
-#if PARI
+#endif
+#if defined(PARI)
 #include "genpari.h"
 #endif
 
 #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"
+#define R_OK 0x04
 #endif
 
 void Pget_rootdir();
@@ -71,28 +76,37 @@ 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 Pput_word(), Pget_word();
 void Ppurge_stdin();
+void Pfprintf();
+void Pimport();
+void Pgetpid();
 
 extern int des_encryption;
 extern char *asir_libdir;
 
 struct ftab file_tab[] = {
+	{"fprintf",Pfprintf,-99999999},
 	{"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_word",Pget_word,1},
+	{"put_word",Pput_word,2},
 	{"get_line",Pget_line,-1},
 	{"remove_file",Premove_file,1},
 	{"access",Paccess,1},
 	{"load",Pload,-1},
+	{"import",Pimport,-1},
 	{"which",Pwhich,1},
 	{"loadfiles",Ploadfiles,1},
 	{"output",Poutput,-1},
 	{"bsave",Pbsave,2},
 	{"bload",Pbload,1},
 	{"get_rootdir",Pget_rootdir,0},
-#if defined(VISUAL) && defined(DES_ENC)
+#if defined(DES_ENC)
 	{"bsave_enc",Pbsave_enc,2},
 	{"bload_enc",Pbload_enc,1},
 #endif
@@ -101,21 +115,38 @@ 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},
 };
 
 static FILE *file_ptrs[BUFSIZ];
 
-void Ppurge_stdin(rp)
-Q *rp;
+void Pfprintf(NODE arg,pointer *rp)
 {
+	FILE *fp;
+	STRING s;
+	asir_assert(ARG0(arg),O_N,"fprintf");
+	fp = file_ptrs[QTOS((Q)ARG0(arg))];
+	if ( !fp ) {
+		error("fprintf : invalid argument");
+	}
+	arg = NEXT(arg);
+	if ( arg ) {
+		Psprintf(arg,&s);
+		fputs(BDY(s),fp);
+		/* fflush(fp); */
+	}
+	*rp = 0;
+	return;
+}
+
+void Ppurge_stdin(Q *rp)
+{
 	purge_stdin(stdin);
 	*rp = 0;
 }
 
-void Popen_file(arg,rp)
-NODE arg;
-Q *rp;
+void Popen_file(NODE arg,Q *rp)
 {
 	char *name;
 	FILE *fp;
@@ -127,18 +158,28 @@ Q *rp;
 	if ( i == BUFSIZ )
 		error("open_file : too many open files");
 	name = BDY((STRING)ARG0(arg));
-	fp = fopen(name,"r");
+	if (strcmp(name,"unix://stdin") == 0) {
+	  fp = stdin;
+	}else if (strcmp(name,"unix://stdout") == 0) {
+	  fp = stdout;
+    }else if (strcmp(name,"unix://stderr") == 0) {
+	  fp = stderr;
+    }else{
+	  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;
 
@@ -152,9 +193,7 @@ 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;
@@ -205,9 +244,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;
@@ -225,14 +262,75 @@ Q *rp;
 		error("get_byte : invalid argument");
 }
 
-void Pload(arg,rp)
-NODE arg;
-Q *rp;
+void Pget_word(NODE arg,Q *rp)
 {
+	int i,c;
+	FILE *fp;
+
+	asir_assert(ARG0(arg),O_N,"get_word");
+	i = QTOS((Q)ARG0(arg));
+	if ( fp = file_ptrs[i] ) {
+		if ( feof(fp) ) {
+			error("get_word : end of file");
+			return;
+		}
+		read_int(fp,&c);
+		STOQ(c,*rp);
+	} else
+		error("get_word : invalid argument");
+}
+
+void Pput_byte(NODE arg,Obj *rp)
+{
+	int i,j,c;
+	FILE *fp;
+	Obj obj;
+	TB tb;
+
+	asir_assert(ARG0(arg),O_N,"put_byte");
+	i = QTOS((Q)ARG0(arg));
+	if ( !(fp = file_ptrs[i]) )
+		error("put_byte : invalid argument");
+
+	obj = (Obj)ARG1(arg);
+	if ( !obj || OID(obj) == O_N ) {
+		c = QTOS((Q)obj);
+		putc(c,fp);
+	} else if ( OID(obj) == O_STR )
+		fputs(BDY((STRING)obj),fp);
+	else if ( OID(obj) == O_TB ) {
+		tb = (TB)obj;
+		for ( j = 0; j < tb->next; j++ )
+			fputs(tb->body[j],fp);
+	}
+	*rp = obj;
+}
+
+void Pput_word(NODE arg,Obj *rp)
+{
+	int i,c;
+	FILE *fp;
+	Obj obj;
+
+	asir_assert(ARG0(arg),O_N,"put_word");
+	asir_assert(ARG1(arg),O_N,"put_word");
+	i = QTOS((Q)ARG0(arg));
+	if ( !(fp = file_ptrs[i]) )
+		error("put_word : invalid argument");
+
+	obj = (Q)ARG1(arg);
+	c = QTOS((Q)obj);
+	write_int(fp,&c);
+	*rp = obj;
+}
+
+void Pload(NODE arg,Q *rp)
+{
 	int ret = 0;
 	char *name,*name0;
 	char errbuf[BUFSIZ];
 
+	if ( !arg ) error("load : invalid argument");
 	if ( ARG0(arg) ) {
 		switch (OID(ARG0(arg))) {
 			case O_STR:
@@ -242,11 +340,7 @@ Q *rp;
 					sprintf(errbuf,"load : \"%s\" not found in the search path",name0);
 					error(errbuf);
 				}
-				ret = loadfile(name);
-				if ( !ret ) {
-					sprintf(errbuf,"load : \"%s\" could not be loaded",name);
-					error(errbuf);
-				}
+				execasirfile(name);
 				break;
 			default:
 				error("load : invalid argument");
@@ -256,11 +350,36 @@ Q *rp;
 	STOQ(ret,*rp);
 }
 
-void Pwhich(arg,rp)
-NODE arg;
-STRING *rp;
+NODE imported_files;
+
+void Pimport(NODE arg,Q *rp)
 {
 	char *name;
+	NODE t,p,opt;
+
+	name = BDY((STRING)ARG0(arg));
+	for ( t = imported_files; t; t = NEXT(t) )
+		if ( !strcmp((char *)BDY(t),name) ) break;
+	if ( !t ) {
+		Pload(arg,rp);
+		MKNODE(t,name,imported_files); 
+		imported_files = t;
+		return;
+	} else if ( current_option ) {
+		for ( opt = current_option; opt; opt = NEXT(opt) ) {
+			p = BDY((LIST)BDY(opt));
+			if ( !strcmp(BDY((STRING)BDY(p)),"reimport") && BDY(NEXT(p)) ) {
+				Pload(arg,rp);
+				return;
+			}
+		}
+	}
+	*rp = 0;
+}
+
+void Pwhich(NODE arg,STRING *rp)
+{
+	char *name;
 	STRING str;
 
 	switch (OID(ARG0(arg))) {
@@ -277,9 +396,7 @@ STRING *rp;
 		*rp = 0;
 }
 
-void Ploadfiles(arg,rp)
-NODE arg;
-Q *rp;
+void Ploadfiles(NODE arg,Q *rp)
 {
 	int ret;
 
@@ -293,11 +410,9 @@ Q *rp;
 	STOQ(ret,*rp);
 }
 
-void Poutput(arg,rp)
-NODE arg;
-Q *rp;
+void Poutput(NODE arg,Q *rp)
 {
-#if PARI
+#if defined(PARI)
 	extern FILE *outfile;
 #endif
 	FILE *fp;
@@ -315,7 +430,7 @@ Q *rp;
 				error("output : invalid filename");
 			break;
 	}
-#if PARI
+#if defined(PARI)
 	pari_outfile =
 #endif
 	asir_out = fp;
@@ -324,9 +439,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;
@@ -347,9 +460,7 @@ Q *rp;
 	*rp = ONE;
 }
 
-void Pbload(arg,rp)
-NODE arg;
-Obj *rp;
+void Pbload(NODE arg,Obj *rp)
 {
 	FILE *fp;
 
@@ -364,12 +475,9 @@ 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");
 	fp = fopen(BDY((STRING)ARG1(arg)),"wb");
@@ -382,9 +490,7 @@ Q *rp;
 	*rp = ONE;
 }
 
-void Pbload_cmo(arg,rp)
-NODE arg;
-Obj *rp;
+void Pbload_cmo(NODE arg,Obj *rp)
 {
 	FILE *fp;
 
@@ -401,19 +507,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 ( GetModuleFileName(NULL,name,BUFSIZ) ) {
+		slash = strrchr(name,'\\');
+		*slash = 0;
+		slash = strrchr(name,'\\');
+		if ( slash ) 
+			*slash = 0;
+		return;
+	}
 	name[0] = 0;
 	ret = RegOpenKeyEx(HKEY_LOCAL_MACHINE, ECGEN_KEYNAME, 0,
 		KEY_QUERY_VALUE, &hOpenKey);
@@ -431,8 +543,7 @@ int len;
 	}
 }
 
-void set_rootdir(name)
-char *name;
+void set_rootdir(char *name)
 {
 	static char DirName[BUFSIZ];
 
@@ -445,15 +556,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];
 
@@ -465,11 +573,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));
@@ -479,20 +585,28 @@ STRING *rp;
 	*rp = &rootdir;
 }
 
-#if defined(VISUAL) && defined(DES_ENC)
-void Pbsave_enc(arg,rp)
-NODE arg;
-Obj *rp;
+void Pgetpid(Q *rp)
 {
+	int id;
+
+#if defined(VISUAL)
+	id = GetCurrentProcessId();
+#else
+	id = getpid();
+#endif
+	STOQ(id,*rp);
+}
+
+#if defined(DES_ENC)
+void Pbsave_enc(NODE arg,Obj *rp)
+{
 	init_deskey();
 	des_encryption = 1;
 	Pbsave(arg,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;
@@ -501,9 +615,7 @@ Obj *rp;
 }
 #endif
 
-void Pbload27(arg,rp)
-NODE arg;
-Obj *rp;
+void Pbload27(NODE arg,Obj *rp)
 {
 	FILE *fp;
 	Obj r;
@@ -518,9 +630,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;
@@ -541,9 +651,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];
@@ -577,26 +685,15 @@ 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
 	if ( access(BDY((STRING)ARG0(arg)),R_OK) >= 0 )
-#endif
 		*rp = ONE;
 	else
 		*rp = 0;
@@ -608,9 +705,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);
 }