joncampbell123/dosbox-x
1
0
Fork 0
mirror of https://github.com/joncampbell123/dosbox-x.git synced 2025-05-08 02:53:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed a bug for folders with Japanese names that have 0x5c at the end.

Browse Source
This commit is contained in:
nanshiki 2023-02-18 12:32:08 +09:00
parent e4aa05fddc
commit 5392c9957f
5 changed files with 26 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/support.h
View File

@ -50,6 +50,7 @@ char * ScanCMDRemain(char * cmd);
char * StripWord(char *&line);
Bits ConvDecWord(char * word);
Bits ConvHexWord(char * word);
bool check_last_split_char(const char *name, size_t len, char split);
enum {
UTF8ERR_INVALID=-1,

10
src/dos/dos_files.cpp
View File

@ -300,7 +300,7 @@ bool DOS_GetSFNPath(char const * const path,char * SFNPath,bool LFN) {
int fbak=lfn_filefind_handle;
for (char *s = strchr_dbcs(p,'\\'); s != NULL; s = strchr_dbcs(p,'\\')) {
*s = 0;
if (SFNPath[strlen(SFNPath)-1]=='\\')
if (check_last_split_char(SFNPath, strlen(SFNPath), '\\'))
sprintf(pdir,"\"%s%s\"",SFNPath,p);
else
sprintf(pdir,"\"%s\\%s\"",SFNPath,p);
@ -393,7 +393,7 @@ bool DOS_ChangeDir(char const * const dir) {
return false;
}
if (!DOS_MakeName(dir,fulldir,&drive)) return false;
if (strlen(fulldir) && testdir[len-1]=='\\') {
if (strlen(fulldir) && check_last_split_char(testdir, len, '\\')) {
DOS_SetError(DOSERR_PATH_NOT_FOUND);
return false;
}
@ -410,7 +410,7 @@ bool DOS_ChangeDir(char const * const dir) {
bool DOS_MakeDir(char const * const dir) {
uint8_t drive;char fulldir[DOS_PATHLENGTH];
size_t len = strlen(dir);
if(!len || dir[len-1] == '\\') {
if(!len || check_last_split_char(dir, len, '\\')) {
DOS_SetError(DOSERR_PATH_NOT_FOUND);
return false;
}
@ -550,7 +550,7 @@ bool DOS_FindFirst(const char * search,uint16_t attr,bool fcb_findfirst) {
uint8_t drive;char fullsearch[DOS_PATHLENGTH];
char dir[DOS_PATHLENGTH];char pattern[DOS_PATHLENGTH];
size_t len = strlen(search);
if(len && search[len - 1] == '\\' && !( (len > 2) && (search[len - 2] == ':') && (attr == DOS_ATTR_VOLUME) )) {
if(len && check_last_split_char(search, len, '\\') && !( (len > 2) && (search[len - 2] == ':') && (attr == DOS_ATTR_VOLUME) )) {
//Dark Forces installer, but c:\ is alright for volume labels(exclusively set)
DOS_SetError(DOSERR_NO_MORE_FILES);
return false;
@ -1307,7 +1307,7 @@ bool DOS_CreateTempFile(char * const name,uint16_t * entry) {
tempname[0]='\\';
tempname++;
} else {
if ((name[namelen-1]!='\\') && (name[namelen-1]!='/')) {
if (!check_last_split_char(name, namelen, '\\') && (name[namelen-1]!='/')) {
tempname[0]='\\';
tempname++;
}

4
src/dos/drive_cache.cpp
View File

@ -198,9 +198,9 @@ char* DOS_Drive_Cache::GetExpandName(const char* path) {
size_t len = strlen(work);
#if defined (WIN32)
//What about OS/2
if((work[len-1] == CROSS_FILESPLIT ) && (len >= 2) && (work[len-2] != ':')) {
if(check_last_split_char(work, len, CROSS_FILESPLIT) && (len >= 2) && (work[len-2] != ':')) {
#else
if((len > 1) && (work[len-1] == CROSS_FILESPLIT )) {
if((len > 1) && check_last_split_char(work, len, CROSS_FILESPLIT)) {
#endif
work[len-1] = 0; // Remove trailing slashes except when in root
}

16
src/misc/support.cpp
View File

@ -115,6 +115,22 @@ char *strtok_dbcs(char *s, const char *d) {
return result;
}
bool check_last_split_char(const char *name, size_t len, char split)
{
bool tail = false;
if((IS_PC98_ARCH || isDBCSCP()) && split == '\\') {
bool lead = false;
for(size_t pos = 0 ; pos < len ; pos++) {
if(lead) lead = false;
else if ((IS_PC98_ARCH && shiftjis_lead_byte(name[pos])) || (isDBCSCP() && isKanji1(name[pos]))) lead = true;
else if(pos == len - 1 && name[pos] == split) tail = true;
}
} else if(len > 0) {
if(name[len - 1] == split) tail = true;
}
return tail;
}
/*
Ripped some source from freedos for this one.

9
src/shell/shell_cmds.cpp
View File

@ -1981,14 +1981,9 @@ void DOS_Shell::CMD_DIR(char * args) {
if (argLen == 0) {
strcpy(args,"*.*"); //no arguments.
} else {
switch (args[argLen-1])
{
case '\\': // handle \, C:\, etc.
case ':' : // handle C:, etc.
// handle \, C:\, etc. handle C:, etc.
if(check_last_split_char(args, argLen, '\\') || args[argLen-1] == ':') {
strcat(args,"*.*");
break;
default:
break;
}
}
args = ExpandDot(args,buffer,CROSS_LEN,!uselfn);