dan
/
TIC-80-guile
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mingw-64 compilation fix

This commit is contained in:
Vadim Grigoruk 2018-08-31 18:29:00 +03:00
parent 617dc01479
commit 4d08ad0cf8
2 changed files with 43 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

92
src/fs.c
View File

@ -131,8 +131,6 @@ static const char* stringToUtf8(const fsString* wstr)
#define freeString(S) free((void*)S) #define freeString(S) free((void*)S)
FILE* _wfopen(const fsString *, const fsString *);
int _wremove(const fsString *);
#define TIC_DIR _WDIR #define TIC_DIR _WDIR
#define tic_dirent _wdirent #define tic_dirent _wdirent
@ -146,6 +144,8 @@ int _wremove(const fsString *);
#define tic_remove _wremove #define tic_remove _wremove
#define tic_fopen _wfopen #define tic_fopen _wfopen
#define tic_mkdir(name) _wmkdir(name) #define tic_mkdir(name) _wmkdir(name)
#define tic_strcpy wcscpy
#define tic_strcat wcscat
#else #else
@ -170,6 +170,8 @@ typedef char fsString;
#define tic_remove remove #define tic_remove remove
#define tic_fopen fopen #define tic_fopen fopen
#define tic_mkdir(name) mkdir(name, 0700) #define tic_mkdir(name) mkdir(name, 0700)
#define tic_strcpy strcpy
#define tic_strcat strcat
#endif #endif
@ -298,6 +300,42 @@ static void netDirRequest(const char* path, ListCallback callback, void* data)
#endif #endif
static void enumFiles(FileSystem* fs, const char* path, ListCallback callback, void* data, bool folder)
{
TIC_DIR *dir = NULL;
struct tic_dirent* ent = NULL;
const fsString* pathString = utf8ToString(path);
if ((dir = tic_opendir(pathString)) != NULL)
{
fsString fullPath[FILENAME_MAX];
struct tic_stat_struct s;
while ((ent = tic_readdir(dir)) != NULL)
{
if(*ent->d_name != _S('.'))
{
tic_strcpy(fullPath, pathString);
tic_strcat(fullPath, ent->d_name);
if(tic_stat(fullPath, &s) == 0 && folder ? S_ISDIR(s.st_mode) : S_ISREG(s.st_mode))
{
const char* name = stringToUtf8(ent->d_name);
bool result = callback(name, NULL, 0, data, folder);
freeString(name);
if(!result) break;
}
}
}
tic_closedir(dir);
}
freeString(pathString);
}
void fsEnumFiles(FileSystem* fs, ListCallback callback, void* data) void fsEnumFiles(FileSystem* fs, ListCallback callback, void* data)
{ {
#if !defined(__EMSCRIPTEN__) #if !defined(__EMSCRIPTEN__)
@ -312,56 +350,10 @@ void fsEnumFiles(FileSystem* fs, ListCallback callback, void* data)
#endif #endif
TIC_DIR *dir = NULL;
struct tic_dirent* ent = NULL;
const char* path = getFilePath(fs, ""); const char* path = getFilePath(fs, "");
{ enumFiles(fs, path, callback, data, true);
const fsString* pathString = utf8ToString(path); enumFiles(fs, path, callback, data, false);
if ((dir = tic_opendir(pathString)) != NULL)
{
while ((ent = tic_readdir(dir)) != NULL)
{
if (ent->d_type == DT_DIR && *ent->d_name != _S('.'))
{
const char* name = stringToUtf8(ent->d_name);
bool result = callback(name, NULL, 0, data, true);
freeString(name);
if(!result) break;
}
}
tic_closedir(dir);
}
freeString(pathString);
}
{
const fsString* pathString = utf8ToString(path);
if ((dir = tic_opendir(pathString)) != NULL)
{
while ((ent = tic_readdir(dir)) != NULL)
{
if (ent->d_type == DT_REG)
{
const char* name = stringToUtf8(ent->d_name);
bool result = callback(name, NULL, 0, data, false);
freeString(name);
if (!result)break;
}
}
tic_closedir(dir);
}
freeString(pathString);
}
} }
bool fsDeleteDir(FileSystem* fs, const char* name) bool fsDeleteDir(FileSystem* fs, const char* name)

2
src/tic80.c
View File

File diff suppressed because one or more lines are too long