--- np2/x11/dosio.c	2003/11/16 16:43:45	1.2
+++ np2/x11/dosio.c	2004/02/05 13:45:06	1.9
@@ -1,10 +1,8 @@
+/*	$Id: dosio.c,v 1.9 2004/02/05 13:45:06 monaka Exp $	*/
+
 #include "compiler.h"
 
-#include <sys/stat.h>
 #include <time.h>
-#if defined(WIN32)
-#include <direct.h>
-#endif
 
 #include "codecnv.h"
 #include "dosio.h"
@@ -34,7 +32,11 @@ dosio_term(void)
 FILEH
 file_open(const char *path)
 {
+	FILEH fh;
 
+	fh = fopen(path, "rb+");
+	if (fh)
+		return fh;
 	return fopen(path, "rb");
 }
 
@@ -100,7 +102,7 @@ file_attr(const char *path)
 
 	if (stat(path, &sb) == 0) {
 		if (S_ISDIR(sb.st_mode)) {
-			return(FILEATTR_DIRECTORY);
+			return FILEATTR_DIRECTORY;
 		}
 		attr = 0;
 		if (!(sb.st_mode & S_IWUSR)) {
@@ -111,28 +113,36 @@ file_attr(const char *path)
 	return -1;
 }
 
-short
-file_getdatetime(FILEH handle, DOSDATE *dosdate, DOSTIME *dostime)
+static BOOL
+cnvdatetime(struct stat *sb, DOSDATE *dosdate, DOSTIME *dostime)
 {
-	struct stat sb;
 	struct tm *ftime;
 
-	if (fstat(fileno(handle), &sb) == 0) {
-		ftime = localtime(&sb.st_mtime);
-		if (ftime) {
-			if (dosdate) {
-				dosdate->year = ftime->tm_year + 1900;
-				dosdate->month = ftime->tm_mon + 1;
-				dosdate->day = ftime->tm_mday;
-			}
-			if (dostime) {
-				dostime->hour = ftime->tm_hour;
-				dostime->minute = ftime->tm_min;
-				dostime->second = ftime->tm_sec;
-			}
-			return 0;
+	ftime = localtime(&sb->st_mtime);
+	if (ftime) {
+		if (dosdate) {
+			dosdate->year = ftime->tm_year + 1900;
+			dosdate->month = ftime->tm_mon + 1;
+			dosdate->day = ftime->tm_mday;
 		}
+		if (dostime) {
+			dostime->hour = ftime->tm_hour;
+			dostime->minute = ftime->tm_min;
+			dostime->second = ftime->tm_sec;
+		}
+		return SUCCESS;
 	}
+	return FAILURE;
+}
+
+short
+file_getdatetime(FILEH handle, DOSDATE *dosdate, DOSTIME *dostime)
+{
+	struct stat sb;
+
+	if ((fstat(fileno(handle), &sb) == 0)
+	 && (cnvdatetime(&sb, dosdate, dostime)))
+		return 0;
 	return -1;
 }
 
@@ -215,8 +225,80 @@ file_attr_c(const char *sjis)
 	return file_attr_c(curpath);
 }
 
+FLISTH
+file_list1st(const char *dir, FLINFO *fli)
+{
+	FLISTH ret;
+
+	ret = (FLISTH)malloc(sizeof(_FLISTH));
+	if (ret == NULL) {
+		VERBOSE(("file_list1st: couldn't alloc memory (size = %d)", sizeof(_FLISTH)));
+		return FLISTH_INVALID;
+	}
+
+	mileuc_ncpy(ret->path, dir, sizeof(ret->path));
+	file_setseparator(ret->path, sizeof(ret->path));
+	ret->hdl = opendir(ret->path);
+	VERBOSE(("file_list1st: opendir(%s)", ret->path));
+	if (ret->hdl == NULL) {
+		VERBOSE(("file_list1st: opendir failure"));
+		free(ret);
+		return FLISTH_INVALID;
+	}
+	if (file_listnext((FLISTH)ret, fli) == SUCCESS) {
+		return (FLISTH)ret;
+	}
+	VERBOSE(("file_list1st: file_listnext failure"));
+	closedir(ret->hdl);
+	free(ret);
+	return FLISTH_INVALID;
+}
+
+BOOL
+file_listnext(FLISTH hdl, FLINFO *fli)
+{
+	char buf[MAX_PATH];
+	struct dirent *de;
+	struct stat sb;
+
+	de = readdir(hdl->hdl);
+	if (de == NULL) {
+		VERBOSE(("file_listnext: readdir failure"));
+		return FAILURE;
+	}
+
+	milstr_ncpy(buf, hdl->path, sizeof(buf));
+	milstr_ncat(buf, de->d_name, sizeof(buf));
+	if (stat(buf, &sb) != 0) {
+		VERBOSE(("file_listnext: stat failure. (path = %s)", buf));
+		return FAILURE;
+	}
+
+	fli->caps = FLICAPS_SIZE | FLICAPS_ATTR | FLICAPS_DATE | FLICAPS_TIME;
+	fli->size = sb.st_size;
+	fli->attr = 0;
+	if (S_ISDIR(sb.st_mode)) {
+		fli->attr |= FILEATTR_DIRECTORY;
+	}
+	if (!(sb.st_mode & S_IWUSR)) {
+		fli->attr |= FILEATTR_READONLY;
+	}
+	cnvdatetime(&sb, &fli->date, &fli->time);
+	mileuc_ncpy(fli->path, de->d_name, sizeof(fli->path));
+	VERBOSE(("file_listnext: success"));
+	return SUCCESS;
+}
+
+void
+file_listclose(FLISTH hdl)
+{
+
+	if (hdl) {
+		closedir(hdl->hdl);
+		free(hdl);
+	}
+}
 
-#if 0
 static int
 euckanji1st(const char *str, int pos)
 {
@@ -228,7 +310,24 @@ euckanji1st(const char *str, int pos)
 	}
 	return ret;
 }
-#endif
+
+void
+file_cpyname(char *dst, const char *src, int maxlen)
+{
+	int i;
+
+	if (maxlen--) {
+		for (i = 0; i < maxlen && src[i] != '\0'; i++) {
+			dst[i] = src[i];
+		}
+		if (i > 0) {
+			if (euckanji1st(src, i-1)) {
+				i--;
+			}
+		}
+		dst[i] = '\0';
+	}
+}
 
 void
 file_catname(char *path, const char *sjis, int maxlen)
@@ -243,24 +342,30 @@ file_catname(char *path, const char *sji
 	}
 	if (maxlen) {
 		codecnv_sjis2euc(path, maxlen, sjis, (UINT)-1);
-		for (;;) {
-			if (!ISKANJI(*path)) {
-				if (*(path+1) == '\0') {
+		for (; path[0] != '\0'; path++) {
+			if (!ISKANJI(path[0])) {
+				if (path[1] == '\0') {
 					break;
 				}
 				path++;
-			} else if ((((*path) - 0x41) & 0xff) < 26) {
-				*path |= 0x20;
-			} else if (*path == '\\') {
-				*path = '/';
-			} else if (*path == '\0') {
-				break;
+			} else if ((((path[0]) - 0x41) & 0xff) < 26) {
+				path[0] |= 0x20;
+			} else if (path[0] == '\\') {
+				path[0] = '/';
 			}
-			path++;
 		}
 	}
 }
 
+BOOL
+file_cmpname(const char *path, const char *sjis)
+{
+	char euc[MAX_PATH];
+
+	codecnv_sjis2euc(euc, sizeof(euc), sjis, (UINT)-1);
+	return strcmp(path, euc);
+}
+
 char *
 file_getname(char *path)
 {