===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/builtin/file.c,v
retrieving revision 1.23
retrieving revision 1.34
diff -u -p -r1.23 -r1.34
--- OpenXM_contrib2/asir2000/builtin/file.c	2006/09/13 02:26:13	1.23
+++ OpenXM_contrib2/asir2000/builtin/file.c	2015/08/14 13:51:54	1.34
@@ -45,28 +45,31 @@
  * 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.22 2006/02/08 02:11:19 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/builtin/file.c,v 1.33 2015/08/06 10:01:51 fujimoto Exp $ 
 */
 #include "ca.h"
 #include "parse.h"
 #include "ox.h"
 #include "base.h"
-#if !defined(VISUAL)
+#if !defined(VISUAL) && !defined(__MINGW32__)
 #include "unistd.h"
 #endif
 #if defined(PARI)
 #include "genpari.h"
 #endif
 
-#if defined(VISUAL)
+#if defined(VISUAL) || defined(__MINGW32__)
 #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 Psprintf(NODE,STRING *);
+
 void Pget_rootdir();
 void Paccess(),Premove_file();
 void Pbsave_enc(), Pbload_enc();
@@ -76,18 +79,24 @@ void Pbsave(), Pbload(), Pbload27();
 void Pbsave_compat(), Pbload_compat();
 void Pbsave_cmo(), Pbload_cmo();
 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,-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},
@@ -99,7 +108,7 @@ struct ftab file_tab[] = {
 	{"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
@@ -108,11 +117,31 @@ 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 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);
@@ -235,6 +264,24 @@ void Pget_byte(NODE arg,Q *rp)
 		error("get_byte : invalid argument");
 }
 
+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;
@@ -261,6 +308,24 @@ void Pput_byte(NODE arg,Obj *rp)
 	*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;
@@ -443,7 +508,7 @@ void Pbload_cmo(NODE arg,Obj *rp)
 
 static struct oSTRING rootdir;
 
-#if defined(VISUAL)
+#if defined(VISUAL) || defined(__MINGW32__)
 void get_rootdir(char *name,int len)
 {
 	LONG	ret;
@@ -455,11 +520,11 @@ void get_rootdir(char *name,int len)
 		strcpy(name,rootdir.body);
 		return;
 	}
-
-	if ( access("UseCurrentDir",0) >= 0 ) {
-		GetCurrentDirectory(BUFSIZ,name);
+	if ( GetModuleFileName(NULL,name,BUFSIZ) ) {
 		slash = strrchr(name,'\\');
-		if ( slash )
+		*slash = 0;
+		slash = strrchr(name,'\\');
+		if ( slash ) 
 			*slash = 0;
 		return;
 	}
@@ -522,7 +587,19 @@ void Pget_rootdir(STRING *rp)
 	*rp = &rootdir;
 }
 
-#if defined(VISUAL) && defined(DES_ENC)
+void Pgetpid(Q *rp)
+{
+	int id;
+
+#if defined(VISUAL) || defined(__MINGW32__)
+	id = GetCurrentProcessId();
+#else
+	id = getpid();
+#endif
+	STOQ(id,*rp);
+}
+
+#if defined(DES_ENC)
 void Pbsave_enc(NODE arg,Obj *rp)
 {
 	init_deskey();
@@ -618,17 +695,13 @@ void Premove_file(NODE arg,Q *rp)
 
 void Paccess(NODE arg,Q *rp)
 {
-#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;
 }
 
-#if defined(VISUAL)
+#if defined(VISUAL) || defined(__MINGW32__)
 int process_id()
 {
 	return GetCurrentProcessId();