===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/builtin/file.c,v
retrieving revision 1.34
retrieving revision 1.37
diff -u -p -r1.34 -r1.37
--- OpenXM_contrib2/asir2000/builtin/file.c	2015/08/14 13:51:54	1.34
+++ OpenXM_contrib2/asir2000/builtin/file.c	2017/09/02 04:04:41	1.37
@@ -45,12 +45,13 @@
  * 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.33 2015/08/06 10:01:51 fujimoto 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"
+#include <stdlib.h>
 #if !defined(VISUAL) && !defined(__MINGW32__)
 #include "unistd.h"
 #endif
@@ -171,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);
@@ -241,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");
@@ -509,23 +516,33 @@ void Pbload_cmo(NODE arg,Obj *rp)
 static struct oSTRING rootdir;
 
 #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 ( GetModuleFileName(NULL,name,BUFSIZ) ) {
-		slash = strrchr(name,'\\');
-		*slash = 0;
-		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;
@@ -538,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);
 	}
 }