vilyaem/Xrasher
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

filesystem: re-enable folder check for array returned by listdirectory with dirs_only set to true

Browse source 
According to glibc manual, not all filesystems support it and some might return DT_UNKNOWN.
This commit is contained in:
Alibek Omarov 2025-01-07 09:22:58 +03:00
parent cfebb3e1d6
commit 1907485895
1 changed files with 1 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
filesystem/filesystem.c
View file

@ -262,7 +262,7 @@ void listdirectory( stringlist_t *list, const char *path, qboolean dirs_only )
while(( entry = readdir( dir )))
{
// FIXME: this is a BSD extension, add check to wscript
if( dirs_only && entry->d_type != DT_DIR )
if( dirs_only && entry->d_type != DT_DIR && entry->d_type != DT_UNKNOWN )
continue;
stringlistappend( list, entry->d_name );
@ -1517,10 +1517,8 @@ static void FS_ValidateDirectories( const char *path, qboolean *has_base_dir, qb
for( i = 0; i < dirs.numstrings; i++ )
{
#if 0 // re-enable if target doesn't support filtering directories only (missing d_type in struct dirent)
if( !FS_SysFolderExists( dirs.strings[i] ))
continue;
#endif
if( !Q_stricmp( fs_basedir, dirs.strings[i] ))
*has_base_dir = true;
@ -1607,10 +1605,8 @@ qboolean FS_InitStdio( qboolean unused_set_to_true, const char *rootdir, const c
for( i = 0; i < dirs.numstrings; i++ )
{
#if 0 // re-enable if target doesn't support filtering directories only (missing d_type in struct dirent)
if( !FS_SysFolderExists( dirs.strings[i] ))
continue;
#endif
if( FI.games[FI.numgames] == NULL )
FI.games[FI.numgames] = Mem_Malloc( fs_mempool, sizeof( *FI.games[FI.numgames] ));
@ -1632,10 +1628,8 @@ qboolean FS_InitStdio( qboolean unused_set_to_true, const char *rootdir, const c
{
int j;
#if 0 // re-enable if target doesn't support filtering directories only (missing d_type in struct dirent)
if( !FS_SysFolderExists( dirs.strings[i] ))
continue;
#endif
// update gameinfo from rwdir, if it's newer
// with rodir we should never create new gameinfos anymore,