mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-01 00:32:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't make retro_dirent.c dependent on file/file_path.c

Browse Source
This commit is contained in:
twinaphex 2015-09-04 18:50:09 +02:00
parent b0f54b896a
commit 9b77a7ecae
1 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
libretro-common/file/retro_dirent.c
View File

@ -28,8 +28,6 @@
#include <boolean.h> #include <boolean.h>
#include <file/file_path.h>
struct RDIR struct RDIR
{ {
#if defined(_WIN32) #if defined(_WIN32)
@ -101,6 +99,14 @@ const char *retro_dirent_get_name(struct RDIR *rdir)
#endif #endif
} }
#if defined(__CELLOS_LV2__)
#ifndef S_ISDIR
#define S_ISDIR(x) (x & 0040000)
#endif
#endif
/** /**
* *
* retro_dirent_is_dir: * retro_dirent_is_dir:
@ -124,18 +130,28 @@ bool retro_dirent_is_dir(struct RDIR *rdir, const char *path)
#elif defined(VITA) #elif defined(VITA)
return PSP2_S_ISDIR(entry->d_stat.st_mode); return PSP2_S_ISDIR(entry->d_stat.st_mode);
#endif #endif
#elif defined(__CELLOS_LV2__)
return S_ISDIR(entry->d_stat.st_mode);
#elif defined(DT_DIR) #elif defined(DT_DIR)
const struct dirent *entry = (const struct dirent*)rdir->entry; const struct dirent *entry = (const struct dirent*)rdir->entry;
if (entry->d_type == DT_DIR) if (entry->d_type == DT_DIR)
return true; return true;
else if (entry->d_type == DT_UNKNOWN /* This can happen on certain file systems. */ else if (entry->d_type == DT_UNKNOWN /* This can happen on certain file systems. */
|| entry->d_type == DT_LNK) || entry->d_type == DT_LNK)
return path_is_directory(path); {
struct stat buf;
if (stat(path, &buf) < 0)
return false;
return S_ISDIR(buf.st_mode);
}
return false; return false;
#else /* dirent struct doesn't have d_type, do it the slow way ... */ #else /* dirent struct doesn't have d_type, do it the slow way ... */
const struct dirent *entry = (const struct dirent*)data; struct stat buf;
return path_is_directory(path); if (stat(path, &buf) < 0)
return false;
return S_ISDIR(buf.st_mode);
#endif #endif
} }