===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/builtin/file.c,v
retrieving revision 1.25
retrieving revision 1.37
diff -u -p -r1.25 -r1.37
--- OpenXM_contrib2/asir2000/builtin/file.c	2008/11/18 09:17:31	1.25
+++ OpenXM_contrib2/asir2000/builtin/file.c	2017/09/02 04:04:41	1.37
@@ -45,28 +45,32 @@
  * 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.24 2006/11/08 07:34:33 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/builtin/file.c,v 1.36 2017/06/12 06:22:50 noro Exp $ 
 */
 #include "ca.h"
 #include "parse.h"
 #include "ox.h"
 #include "base.h"
-#if !defined(VISUAL)
+#include <stdlib.h>
+#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();
@@ -80,6 +84,7 @@ void Pput_word(), Pget_word();
 void Ppurge_stdin();
 void Pfprintf();
 void Pimport();
+void Pgetpid();
 
 extern int des_encryption;
 extern char *asir_libdir;
@@ -104,7 +109,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
@@ -113,6 +118,7 @@ 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},
 };
 
@@ -131,7 +137,7 @@ void Pfprintf(NODE arg,pointer *rp)
 	if ( arg ) {
 		Psprintf(arg,&s);
 		fputs(BDY(s),fp);
-		fflush(fp);
+		/* fflush(fp); */
 	}
 	*rp = 0;
 	return;
@@ -166,7 +172,7 @@ void Popen_file(NODE arg,Q *rp)
 		asir_assert(ARG1(arg),O_STR,"open_file");
 		fp = fopen(name,BDY((STRING)ARG1(arg)));
 	  } else
-		fp = fopen(name,"r");
+		fp = fopen(name,"rb");
     }
 	if ( !fp ) {
 		sprintf(errbuf,"open_file : cannot open \"%s\"",name);
@@ -236,6 +242,12 @@ void Pget_line(NODE arg,STRING *rp)
 		fsetpos(fp,&head);
 		str = (char *)MALLOC_ATOMIC(j+1);	
 		fgets(str,j+1,fp);	
+                for ( i = 0; i < j; i++ )
+                  if ( str[i] == '\r' ) {
+                     str[i] = '\n';
+                     str[i+1] = 0;
+                     break;
+                  }
 		MKSTR(*rp,str);
 	} else
 		error("get_line : invalid argument");
@@ -503,24 +515,34 @@ void Pbload_cmo(NODE arg,Obj *rp)
 
 static struct oSTRING rootdir;
 
-#if defined(VISUAL)
+#if defined(VISUAL) || defined(__MINGW32__)
+static void chop_delim(char *s)
+{
+    int n=strlen(s);
+    if(n>1 && s[n-1]=='\\') {
+        s[n-1]=0;
+    }
+}
+
 void get_rootdir(char *name,int len)
 {
 	LONG	ret;
 	HKEY	hOpenKey;
 	DWORD	Type;
-	char	*slash;
+	char    drive[_MAX_DRIVE], dir0[_MAX_DIR], dir[_MAX_DIR];
+	char    fullname[_MAX_PATH];
 
 	if ( rootdir.body ) {
-		strcpy(name,rootdir.body);
+		strcpy_s(name,len,rootdir.body);
 		return;
 	}
-
-	if ( access("UseCurrentDir",0) >= 0 ) {
-		GetCurrentDirectory(BUFSIZ,name);
-		slash = strrchr(name,'\\');
-		if ( slash )
-			*slash = 0;
+	if ( GetModuleFileName(NULL,fullname,_MAX_PATH) ) {
+        _splitpath(fullname,drive,dir0,NULL,NULL);
+        chop_delim(dir0);
+        _splitpath(dir0,NULL,dir,NULL,NULL);
+        chop_delim(dir);
+        strcpy_s(name,len,drive);
+        strcat_s(name,len,dir);
 		return;
 	}
 	name[0] = 0;
@@ -533,10 +555,11 @@ void get_rootdir(char *name,int len)
 		RegQueryValueEx(hOpenKey, "Directory", NULL, &Type, name, &len);
 		RegCloseKey(hOpenKey);
 	} else {
-		GetCurrentDirectory(len,name);
-		slash = strrchr(name,'\\');
-		if ( slash )
-			*slash = 0;
+        GetCurrentDirectory(_MAX_PATH,fullname);
+        _splitpath(fullname,drive,dir,NULL,NULL);
+        chop_delim(dir);
+        strcpy_s(name,len,drive);
+        strcat_s(name,len,dir);
 	}
 }
 
@@ -582,7 +605,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();
@@ -678,17 +713,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();