Emulation/libretro-common
1
0
Fork 0
mirror of https://github.com/libretro/libretro-common.git synced 2024-06-22 22:22:39 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #58 from hiddenasbestos/retro_opendir_r2

Browse source 
Sync of fix for retro_opendir applied to RetroArch
This commit is contained in:
Twinaphex 2018-04-13 19:38:05 +02:00 committed by GitHub
parent 84477f30d9 29327ab9f3
commit 5550f21d69
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
file/retro_dirent.c
View file

@ -106,14 +106,16 @@ struct RDIR *retro_opendir(const char *name)
wchar_t *path_wide = NULL;
unsigned path_len;
#endif
struct RDIR *rdir = (struct RDIR*)calloc(1, sizeof(*rdir));
struct RDIR *rdir;
if (!rdir||!name)
{
if (rdir)
free(rdir);
/*Reject null or empty string paths*/
if (!name||(*name==0))
return NULL;
/*Allocate RDIR struct. Tidied later with retro_closedir*/
rdir = (struct RDIR*)calloc(1, sizeof(*rdir));
if (!rdir)
return NULL;
}
#if defined(_WIN32)
(void)path_wide;

10
include/retro_dirent.h
View file

@ -32,6 +32,16 @@ RETRO_BEGIN_DECLS
typedef struct RDIR RDIR;
/**
*
* retro_opendir:
* @name : path to the directory to open.
*
* Opens a directory for reading. Tidy up with retro_closedir.
*
* Returns: RDIR pointer on success, NULL if name is not a
* valid directory, null itself or the empty string.
*/
struct RDIR *retro_opendir(const char *name);
int retro_readdir(struct RDIR *rdir);