mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-10 15:45:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Unix buildfix for dirent_is_directory

Browse Source
This commit is contained in:
krzys-h 2019-01-13 14:49:01 +01:00
parent 109de0bebb
commit 4b2278688b
4 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -98,14 +98,14 @@ const char *retro_dirent_get_name(struct RDIR *rdir)
* *
* retro_dirent_is_dir: * retro_dirent_is_dir:
* @rdir : pointer to the directory entry. * @rdir : pointer to the directory entry.
* @path : path to the directory entry. * @unused : deprecated, included for compatibility reasons, pass NULL
* *
* Is the directory listing entry a directory? * Is the directory listing entry a directory?
* *
* Returns: true if directory listing entry is * Returns: true if directory listing entry is
* a directory, false if not. * a directory, false if not.
*/ */
bool retro_dirent_is_dir(struct RDIR *rdir, const char *path) bool retro_dirent_is_dir(struct RDIR *rdir, const char *unused)
{ {
if (dirent_dirent_is_dir_cb != NULL) if (dirent_dirent_is_dir_cb != NULL)
return dirent_dirent_is_dir_cb((struct retro_vfs_dir_handle *)rdir); return dirent_dirent_is_dir_cb((struct retro_vfs_dir_handle *)rdir);

3
libretro-common/include/retro_dirent.h
View File

@ -62,13 +62,14 @@ const char *retro_dirent_get_name(struct RDIR *rdir);
* *
* retro_dirent_is_dir: * retro_dirent_is_dir:
* @rdir : pointer to the directory entry. * @rdir : pointer to the directory entry.
* @unused : deprecated, included for compatibility reasons, pass NULL
* *
* Is the directory listing entry a directory? * Is the directory listing entry a directory?
* *
* Returns: true if directory listing entry is * Returns: true if directory listing entry is
* a directory, false if not. * a directory, false if not.
*/ */
bool retro_dirent_is_dir(struct RDIR *rdir, const char *path); bool retro_dirent_is_dir(struct RDIR *rdir, const char *unused);
void retro_closedir(struct RDIR *rdir); void retro_closedir(struct RDIR *rdir);

2
libretro-common/lists/dir_list.c
View File

@ -187,7 +187,7 @@ static int dir_list_read(const char *dir,
file_path[0] = '\0'; file_path[0] = '\0';
fill_pathname_join(file_path, dir, name, sizeof(file_path)); fill_pathname_join(file_path, dir, name, sizeof(file_path));
is_dir = retro_dirent_is_dir(entry, file_path); is_dir = retro_dirent_is_dir(entry, NULL);
if(!is_dir) if(!is_dir)
file_ext = path_get_extension(name); file_ext = path_get_extension(name);

9
libretro-common/vfs/vfs_implementation.c
View File

@ -184,6 +184,7 @@
#include <memmap.h> #include <memmap.h>
#include <encodings/utf.h> #include <encodings/utf.h>
#include <compat/fopen_utf8.h> #include <compat/fopen_utf8.h>
#include <file/file_path.h>
#define RFILE_HINT_UNBUFFERED (1 << 8) #define RFILE_HINT_UNBUFFERED (1 << 8)
@ -953,6 +954,7 @@ struct retro_vfs_dir_handle
struct libretro_vfs_implementation_dir struct libretro_vfs_implementation_dir
#endif #endif
{ {
char* orig_path;
#if defined(_WIN32) #if defined(_WIN32)
#if defined(LEGACY_WIN32) #if defined(LEGACY_WIN32)
WIN32_FIND_DATA entry; WIN32_FIND_DATA entry;
@ -1013,6 +1015,8 @@ libretro_vfs_implementation_dir *retro_vfs_opendir_impl(const char *name, bool i
if (!rdir) if (!rdir)
return NULL; return NULL;
rdir->orig_path = strdup(name);
#if defined(_WIN32) #if defined(_WIN32)
(void)path_wide; (void)path_wide;
(void)path_local; (void)path_local;
@ -1164,6 +1168,9 @@ bool retro_vfs_dirent_is_dir_impl(libretro_vfs_implementation_dir *rdir)
return false; return false;
#endif #endif
/* dirent struct doesn't have d_type, do it the slow way ... */ /* dirent struct doesn't have d_type, do it the slow way ... */
char path[PATH_MAX_LENGTH];
path[0] = '\0';
fill_pathname_join(path, rdir->orig_path, retro_vfs_dirent_get_name_impl(rdir), sizeof(path));
if (stat(path, &buf) < 0) if (stat(path, &buf) < 0)
return false; return false;
return S_ISDIR(buf.st_mode); return S_ISDIR(buf.st_mode);
@ -1191,6 +1198,8 @@ int retro_vfs_closedir_impl(libretro_vfs_implementation_dir *rdir)
closedir(rdir->directory); closedir(rdir->directory);
#endif #endif
if (rdir->orig_path)
free(rdir->orig_path);
free(rdir); free(rdir);
return 0; return 0;
} }