UnrealXR/raylib
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Review module to fit raylib conventions

Browse source 
Support custom allocators
This commit is contained in:
raysan5 2020-01-19 12:29:21 +01:00
parent 1c4dadcf68
commit edc1d2511d
1 changed files with 144 additions and 159 deletions
Download patch file Download diff file Expand all files Collapse all files

179
src/external/dirent.h vendored
View file

@ -1,34 +1,10 @@
#ifndef DIRENT_H /****************************************************************************
#define DIRENT_H
/*
Declaration of POSIX directory browsing functions and types for Win32. Declaration of POSIX directory browsing functions and types for Win32.
Author: Kevlin Henney (kevlin@acm.org, kevlin@curbralan.com) Author: Kevlin Henney (kevlin@acm.org, kevlin@curbralan.com)
History: Created March 1997. Updated June 2003. History: Created March 1997. Updated June 2003.
Rights: See end of file. Reviewed by Ramon Santamaria for raylib on January 2020.
*/
#ifdef __cplusplus
extern "C"
{
#endif
typedef struct DIR DIR;
struct dirent
{
char *d_name;
};
DIR *opendir(const char *);
int closedir(DIR *);
struct dirent *readdir(DIR *);
void rewinddir(DIR *);
/*
Copyright Kevlin Henney, 1997, 2003. All rights reserved. Copyright Kevlin Henney, 1997, 2003. All rights reserved.
@ -41,7 +17,41 @@ void rewinddir(DIR *);
But that said, if there are any problems please get in touch. But that said, if there are any problems please get in touch.
*/ ****************************************************************************/
#ifndef DIRENT_H
#define DIRENT_H
// Allow custom memory allocators
#ifndef DIRENT_MALLOC
#define DIRENT_MALLOC(sz) malloc(sz)
#endif
#ifndef DIRENT_FREE
#define DIRENT_FREE(p) free(p)
#endif
//----------------------------------------------------------------------------------
// Types and Structures Definition
//----------------------------------------------------------------------------------
// Fordward declaration of DIR, implementation below
typedef struct DIR DIR;
struct dirent {
char *d_name;
};
#ifdef __cplusplus
extern "C" {
#endif
//------------------------------------------------------------------------------------
// Functions Declaration
//------------------------------------------------------------------------------------
DIR *opendir(const char *name);
int closedir(DIR *dir);
struct dirent *readdir(DIR *dir);
void rewinddir(DIR *dir);
#ifdef __cplusplus #ifdef __cplusplus
} }
@ -49,34 +59,42 @@ void rewinddir(DIR *);
#endif // DIRENT_H #endif // DIRENT_H
/* /****************************************************************************
Implementation of POSIX directory browsing functions and types for Win32. Implementation of POSIX directory browsing functions and types for Win32.
Author: Kevlin Henney (kevlin@acm.org, kevlin@curbralan.com) Author: Kevlin Henney (kevlin@acm.org, kevlin@curbralan.com)
History: Created March 1997. Updated June 2003 and July 2012. History: Created March 1997. Updated June 2003.
Rights: See end of file. Reviewed by Ramon Santamaria for raylib on January 2020.
*/ Copyright Kevlin Henney, 1997, 2003. All rights reserved.
#include <errno.h> Permission to use, copy, modify, and distribute this software and its
#include <io.h> /* _findfirst and _findnext set errno iff they return -1 */ documentation for any purpose is hereby granted without fee, provided
that this copyright and permissions notice appear in all copies and
derivatives.
This software is supplied "as is" without express or implied warranty.
But that said, if there are any problems please get in touch.
****************************************************************************/
#include <io.h> // _findfirst and _findnext set errno iff they return -1
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <errno.h>
#ifdef __cplusplus //----------------------------------------------------------------------------------
extern "C" // Types and Structures Definition
{ //----------------------------------------------------------------------------------
#endif typedef ptrdiff_t handle_type; // C99's intptr_t not sufficiently portable
typedef ptrdiff_t handle_type; /* C99's intptr_t not sufficiently portable */ struct DIR {
handle_type handle; // -1 for failed rewind
struct DIR
{
handle_type handle; /* -1 for failed rewind */
struct _finddata_t info; struct _finddata_t info;
struct dirent result; /* d_name null iff first time */ struct dirent result; // d_name null iff first time
char *name; /* null-terminated char string */ char *name; // null-terminated char string
}; };
DIR *opendir(const char *name) DIR *opendir(const char *name)
@ -86,37 +104,34 @@ DIR *opendir(const char *name)
if (name && name[0]) if (name && name[0])
{ {
size_t base_length = strlen(name); size_t base_length = strlen(name);
const char *all = /* search pattern must end with suitable wildcard */
strchr("/\\", name[base_length - 1]) ? "*" : "/*";
if((dir = (DIR *) malloc(sizeof *dir)) != 0 && // Search pattern must end with suitable wildcard
(dir->name = (char *) malloc(base_length + strlen(all) + 1)) != 0) const char *all = strchr("/\\", name[base_length - 1]) ? "*" : "/*";
if ((dir = (DIR *)DIRENT_MALLOC(sizeof *dir)) != 0 &&
(dir->name = (char *)DIRENT_MALLOC(base_length + strlen(all) + 1)) != 0)
{ {
strcat(strcpy(dir->name, name), all); strcat(strcpy(dir->name, name), all);
if((dir->handle = if ((dir->handle = (handle_type) _findfirst(dir->name, &dir->info)) != -1)
(handle_type) _findfirst(dir->name, &dir->info)) != -1)
{ {
dir->result.d_name = 0; dir->result.d_name = 0;
} }
else /* rollback */ else // rollback
{ {
free(dir->name); DIRENT_FREE(dir->name);
free(dir); DIRENT_FREE(dir);
dir = 0; dir = 0;
} }
} }
else /* rollback */ else // rollback
{ {
free(dir); DIRENT_FREE(dir);
dir = 0; dir = 0;
errno = ENOMEM; errno = ENOMEM;
} }
} }
else else errno = EINVAL;
{
errno = EINVAL;
}
return dir; return dir;
} }
@ -127,19 +142,14 @@ int closedir(DIR *dir)
if (dir) if (dir)
{ {
if(dir->handle != -1) if (dir->handle != -1) result = _findclose(dir->handle);
{
result = _findclose(dir->handle); DIRENT_FREE(dir->name);
DIRENT_FREE(dir);
} }
free(dir->name); // NOTE: All errors ampped to EBADF
free(dir); if (result == -1) errno = EBADF;
}
if(result == -1) /* map all errors to EBADF */
{
errno = EBADF;
}
return result; return result;
} }
@ -156,10 +166,7 @@ struct dirent *readdir(DIR *dir)
result->d_name = dir->info.name; result->d_name = dir->info.name;
} }
} }
else else errno = EBADF;
{
errno = EBADF;
}
return result; return result;
} }
@ -172,27 +179,5 @@ void rewinddir(DIR *dir)
dir->handle = (handle_type) _findfirst(dir->name, &dir->info); dir->handle = (handle_type) _findfirst(dir->name, &dir->info);
dir->result.d_name = 0; dir->result.d_name = 0;
} }
else else errno = EBADF;
{
errno = EBADF;
} }
}
#ifdef __cplusplus
}
#endif
/*
Copyright Kevlin Henney, 1997, 2003, 2012. All rights reserved.
Permission to use, copy, modify, and distribute this software and its
documentation for any purpose is hereby granted without fee, provided
that this copyright and permissions notice appear in all copies and
derivatives.
This software is supplied "as is" without express or implied warranty.
But that said, if there are any problems please get in touch.
*/