YGGverse/xash3d-fwgs
1
0
Fork 0
mirror of https://github.com/YGGverse/xash3d-fwgs.git synced 2025-01-29 16:24:16 +00:00
Code Issues Projects Releases Wiki Activity

filesystem: dir: remove PATH_SEPARATOR, fix return value when directory is caseinsensitive

Browse Source
This commit is contained in:
Alibek Omarov 2023-01-04 22:34:45 +03:00
parent b4c0ccbede
commit 34eb258cae
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
filesystem/dir.c
View File

@ -287,9 +287,9 @@ qboolean FS_FixFileCase( dir_t *dir, const char *path, char *dst, const size_t l
if( !FS_AppendToPath( dst, &i, len, dir->name, path, "init" )) if( !FS_AppendToPath( dst, &i, len, dir->name, path, "init" ))
return false; return false;
for( prev = path, next = Q_strchrnul( prev, PATH_SEPARATOR ); for( prev = path, next = Q_strchrnul( prev, '/' );
; ;
prev = next + 1, next = Q_strchrnul( prev, PATH_SEPARATOR )) prev = next + 1, next = Q_strchrnul( prev, '/' ))
{ {
qboolean uptodate = false; // do not run second scan if we're just updated our directory list qboolean uptodate = false; // do not run second scan if we're just updated our directory list
size_t temp; size_t temp;
@ -309,9 +309,8 @@ qboolean FS_FixFileCase( dir_t *dir, const char *path, char *dst, const size_t l
if( !FS_AppendToPath( dst, &i, len, prev, path, "caseinsensitive entry" )) if( !FS_AppendToPath( dst, &i, len, prev, path, "caseinsensitive entry" ))
return false; return false;
if( FS_SysFileOrFolderExists( dst )) // file not found // check file existense
return createpath; return createpath ? true : FS_SysFileOrFolderExists( dst );
break;
} }
// get our entry name // get our entry name
@ -349,10 +348,10 @@ qboolean FS_FixFileCase( dir_t *dir, const char *path, char *dst, const size_t l
i = temp; i = temp;
// end of string, found file, return // end of string, found file, return
if( next[0] == '\0' || ( next[0] == PATH_SEPARATOR && next[1] == '\0' )) if( next[0] == '\0' || ( next[0] == '/' && next[1] == '\0' ))
break; break;
if( !FS_AppendToPath( dst, &i, len, PATH_SEPARATOR_STR, path, "path separator" )) if( !FS_AppendToPath( dst, &i, len, "/", path, "path separator" ))
return false; return false;
} }