--- np2/generic/hostdrvs.c 2004/01/09 07:27:15 1.2 +++ np2/generic/hostdrvs.c 2004/01/10 17:36:07 1.4 @@ -1,11 +1,14 @@ #include "compiler.h" +#if defined(OSLANG_EUC) +#include "codecnv.h" +#endif #include "dosio.h" #include "pccore.h" #include "hostdrv.h" #include "hostdrvs.h" -static const HDRVDIR hddroot = {" ", 0, 0x10}; +static const HDRVDIR hddroot = {" ", 0, 0, 0x10, {0}, {0}}; static const BYTE dospathchr[] = { 0xfa, 0x23, // '&%$#"! /.-,+*)( @@ -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 ((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 - 0xa0) & 0xff) < 0x40) { + *dst++ = c; + dlen--; + } +#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 >= 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); @@ -96,9 +125,13 @@ LISTARRAY hostdrvs_getpathlist(const cha break; } CopyMemory(hdd->di.fcbname, fcbname, 11); + hdd->di.caps = fli.caps; hdd->di.size = fli.size; hdd->di.attr = fli.attr; + hdd->di.date = fli.date; + hdd->di.time = fli.time; milstr_ncpy(hdd->realname, fli.path, sizeof(hdd->realname)); + TRACEOUT(("%s -> %11s", fli.path, fcbname)); } } while(file_listnext(flh, &fli) == SUCCESS); if (listarray_getitems(ret) == 0) {