OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- fixed I_FindAttr() to handle symlinks on POSIX platforms

Browse source
This commit is contained in:
alexey.lysiuk 2020-01-26 11:03:28 +02:00
commit f9906ae6cd
2 changed files with 13 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/posix/i_system_posix.cpp
View file

@ -19,14 +19,13 @@
//-----------------------------------------------------------------------------
//
#include <stdio.h>
#include <errno.h>
#include <fnmatch.h>
#ifdef __APPLE__
#include <AvailabilityMacros.h>
#endif // __APPLE__
#include "cmdlib.h"
#include "d_protocol.h"
#include "i_system.h"
#include "gameconfigfile.h"
@ -90,6 +89,7 @@ void *I_FindFirst(const char *const filespec, findstate_t *const fileinfo)
{
pattern = slash + 1;
dir = FString(filespec, slash - filespec + 1);
fileinfo->path = dir;
}
else
{
@ -142,7 +142,15 @@ int I_FindClose(void *const handle)
int I_FindAttr(findstate_t *const fileinfo)
{
dirent *const ent = fileinfo->namelist[fileinfo->current];
return (ent->d_type & DT_DIR) ? FA_DIREC : 0;
const FString path = fileinfo->path + ent->d_name;
bool isdir;
if (DirEntryExists(path, &isdir))
{
return isdir ? FA_DIREC : 0;
}
return 0;
}