--- np2/generic/hostdrvs.c	2004/01/10 17:24:01	1.3
+++ np2/generic/hostdrvs.c	2004/01/12 08:01:00	1.5
@@ -1,4 +1,7 @@
 #include	"compiler.h"
+#if defined(OSLANG_EUC)
+#include	"codecnv.h"
+#endif
 #include	"dosio.h"
 #include	"pccore.h"
 #include	"hostdrv.h"
@@ -25,6 +28,7 @@ static void rcnvfcb(char *dst, UINT dlen
 		if (c == 0) {
 			break;
 		}
+#if defined(OSLANG_SJIS) || defined(OSLANG_EUC)
 		if ((((c ^ 0x20) - 0xa1) & 0xff) < 0x3c) {
 			if ((!slen) || (src[0] == '\0')) {
 				break;
@@ -37,16 +41,34 @@ static void rcnvfcb(char *dst, UINT dlen
 			dst += 2;
 			dlen -= 2;
 		}
-		else {
+		else if (((c - 0x20) & 0xff) < 0x60) {
+			if (((c - 'a') & 0xff) < 26) {
+				c -= 0x20;
+			}
+			if (dospathchr[(c >> 3) - (0x20 >> 3)] & (1 << (c & 7))) {
+				*dst++ = c;
+				dlen--;
+			}
+		}
+		else if (((c - 0xa0) & 0xff) < 0x40) {
+			*dst++ = c;
+			dlen--;
+		}
+#else
+		if (((c - 0x20) & 0xff) < 0x60) {
 			if (((c - 'a') & 0xff) < 26) {
 				c -= 0x20;
 			}
-			if ((c >= 0x20) && (c < 0x80) &&
-				(dospathchr[(c >> 3) - (0x20 >> 3)] & (1 << (c & 7)))) {
+			if (dospathchr[(c >> 3) - (0x20 >> 3)] & (1 << (c & 7))) {
 				*dst++ = c;
 				dlen--;
 			}
 		}
+		else if (c >= 0x80) {
+			*dst++ = c;
+			dlen--;
+		}
+#endif
 	}
 }
 
@@ -55,7 +77,14 @@ static BOOL realname2fcb(char *fcbname, 
 	char	*realname;
 	char	*ext;
 
+#if defined(OSLANG_EUC)
+	char		sjis[MAX_PATH];
+
+	codecnv_euc2sjis(sjis, sizeof(sjis), fli->path, sizeof(fli->path));
+	realname = sjis;
+#else
 	realname = fli->path;
+#endif
 	FillMemory(fcbname, 11, ' ');
 	ext = file_getext(realname);
 	rcnvfcb(fcbname+0, 8, realname, ext - realname);
@@ -71,6 +100,15 @@ static BOOL hddsea(void *vpItem, void *v
 	return(FALSE);
 }
 
+static BOOL hddseadir(void *vpItem, void *vpArg) {
+
+	if ((((HDRVLST)vpItem)->di.attr & 0x10) &&
+		(!memcmp(((HDRVLST)vpItem)->di.fcbname, vpArg, 11))) {
+		return(TRUE);
+	}
+	return(FALSE);
+}
+
 LISTARRAY hostdrvs_getpathlist(const char *realpath) {
 
 	FLISTH		flh;
@@ -208,45 +246,61 @@ hdsgrp_err:
 	return(FAILURE);
 }
 
-BOOL hostdrvs_newrealpath(HDRVPATH *hdp, char *dospath) {
+BOOL hostdrvs_getrealdir(char *path, int size, char *fcb, char *dospath) {
 
-	char		path[MAX_PATH];
 	LISTARRAY	lst;
 	HDRVLST		hdl;
-	char		fcbname[11];
-	char		dosname[16];
-	UINT		i;
-	char		*p;
 
-	file_cpyname(path, np2cfg.hdrvroot, sizeof(path));
-	lst = NULL;
-	if (dospath[0] != '\\') {
-		goto hdsgrp_err;
+	file_cpyname(path, np2cfg.hdrvroot, size);
+	if (dospath[0] == '\\') {
+		file_setseparator(path, size);
+		dospath++;
+	}
+	else if (dospath[0] != '\0') {
+		goto hdsgrd_err;
 	}
 	while(1) {
-		file_setseparator(path, sizeof(path));
-		dospath++;
-		if (dospath[0] == '\0') {
-			goto hdsgrp_err;
-		}
-		dospath = dospath2fcb(fcbname, dospath);
+		dospath = dospath2fcb(fcb, dospath);
 		if (dospath[0] != '\\') {
 			break;
 		}
-		listarray_destroy(lst);
 		lst = hostdrvs_getpathlist(path);
-		hdl = (HDRVLST)listarray_enum(lst, hddsea, fcbname);
-		if ((hdl == NULL) || (!(hdl->di.attr & 0x10))) {
-			goto hdsgrp_err;
+		hdl = (HDRVLST)listarray_enum(lst, hddseadir, fcb);
+		if (hdl != NULL) {
+			file_catname(path, hdl->realname, size);
 		}
-		file_catname(path, hdl->realname, sizeof(path));
+		listarray_destroy(lst);
+		if (hdl == NULL) {
+			goto hdsgrd_err;
+		}
+		file_setseparator(path, size);
+		dospath++;
 	}
 	if (dospath[0] != '\0') {
-		goto hdsgrp_err;
+		goto hdsgrd_err;
+	}
+	return(SUCCESS);
+
+hdsgrd_err:
+	return(FAILURE);
+}
+
+BOOL hostdrvs_newrealpath(HDRVPATH *hdp, char *dospath) {
+
+	char		path[MAX_PATH];
+	char		fcb[11];
+	LISTARRAY	lst;
+	HDRVLST		hdl;
+	char		dosname[16];
+	UINT		i;
+	char		*p;
+
+	if ((hostdrvs_getrealdir(path, sizeof(path), fcb, dospath) != SUCCESS) ||
+	 	(fcb[0] == ' ')) {
+		return(FAILURE);
 	}
-	listarray_destroy(lst);
 	lst = hostdrvs_getpathlist(path);
-	hdl = (HDRVLST)listarray_enum(lst, hddsea, fcbname);
+	hdl = (HDRVLST)listarray_enum(lst, hddsea, fcb);
 	if (hdl != NULL) {
 		file_catname(path, hdl->realname, sizeof(path));
 		if (hdp) {
@@ -256,30 +310,25 @@ BOOL hostdrvs_newrealpath(HDRVPATH *hdp,
 	}
 	else {
 		p = dosname;
-		for (i=0; (i<8) && (fcbname[i] != ' '); i++) {
-			*p++ = fcbname[i];
+		for (i=0; (i<8) && (fcb[i] != ' '); i++) {
+			*p++ = fcb[i];
 		}
-		if (fcbname[8] != ' ') {
+		if (fcb[8] != ' ') {
 			*p++ = '.';
-			for (i=8; (i<11) && (fcbname[i] != ' '); i++) {
-				*p++ = fcbname[i];
+			for (i=8; (i<11) && (fcb[i] != ' '); i++) {
+				*p++ = fcb[i];
 			}
 		}
 		*p = '\0';
 		file_catname(path, dosname, sizeof(path));
 		if (hdp) {
-			CopyMemory(hdp->di.fcbname, fcbname, 11);
-			hdp->di.size = 0;
-			hdp->di.attr = 0;
+			ZeroMemory(&hdp->di, sizeof(hdp->di));
+			CopyMemory(hdp->di.fcbname, fcb, 11);
 			file_cpyname(hdp->path, path, sizeof(hdp->path));
 		}
 	}
 	listarray_destroy(lst);
 	return(SUCCESS);
-
-hdsgrp_err:
-	listarray_destroy(lst);
-	return(FAILURE);
 }