MrMonopoly/raylib
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

file loading: ditch SEEK_END strategy for telling stream len

Browse Source
This commit is contained in:
veclav talica 2022-06-23 10:57:49 +05:00
parent d7a0b46006
commit f0486a172e
2 changed files with 28 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/raudio.c
View File

@ -2425,24 +2425,26 @@ static unsigned char *LoadFileData(const char *fileName, unsigned int *bytesRead
if (file != NULL) if (file != NULL)
{ {
// WARNING: On binary streams SEEK_END could not be found, size_t bytesAllocated = 0;
// using fseek() and ftell() could not work in some (rare) cases
fseek(file, 0, SEEK_END);
int size = ftell(file);
fseek(file, 0, SEEK_SET);
if (size > 0) while (!feof(file))
{ {
data = (unsigned char *)RL_MALLOC(size*sizeof(unsigned char)); // TODO: Should granuality of forward allocation/reading be assumed to be 32
// or user should be given the ability to set it in config?
if (bytesAllocated <= *bytesRead) data = (unsigned char *)RL_REALLOC(data, bytesAllocated += 32);
// NOTE: fread() returns number of read elements instead of bytes, so we read [1 byte, size elements] // NOTE: fread() returns number of read elements instead of bytes, so we read [1 byte, size elements]
unsigned int count = (unsigned int)fread(data, sizeof(unsigned char), size, file); *bytesRead += fread(&data[*bytesRead], sizeof(unsigned char), 32, file);
*bytesRead = count;
if (count != size) TRACELOG(LOG_WARNING, "FILEIO: [%s] File partially loaded", fileName); if (ferror(file))
else TRACELOG(LOG_INFO, "FILEIO: [%s] File loaded successfully", fileName); {
TRACELOG(LOG_WARNING, "FILEIO: [%s] Failed to read file", fileName);
RL_FREE(data);
data = NULL;
break;
} }
else TRACELOG(LOG_WARNING, "FILEIO: [%s] Failed to read file", fileName); }
if (data != NULL) TRACELOG(LOG_INFO, "FILEIO: [%s] File loaded successfully", fileName);
fclose(file); fclose(file);
} }

26
src/utils.c
View File

@ -197,24 +197,26 @@ unsigned char *LoadFileData(const char *fileName, unsigned int *bytesRead)
if (file != NULL) if (file != NULL)
{ {
// WARNING: On binary streams SEEK_END could not be found, size_t bytesAllocated = 0;
// using fseek() and ftell() could not work in some (rare) cases
fseek(file, 0, SEEK_END);
int size = ftell(file);
fseek(file, 0, SEEK_SET);
if (size > 0) while (!feof(file))
{ {
data = (unsigned char *)RL_MALLOC(size*sizeof(unsigned char)); // TODO: Should granuality of forward allocation/reading be assumed to be 32
// or user should be given the ability to set it in config?
if (bytesAllocated <= *bytesRead) data = (unsigned char *)RL_REALLOC(data, bytesAllocated += 32);
// NOTE: fread() returns number of read elements instead of bytes, so we read [1 byte, size elements] // NOTE: fread() returns number of read elements instead of bytes, so we read [1 byte, size elements]
unsigned int count = (unsigned int)fread(data, sizeof(unsigned char), size, file); *bytesRead += fread(&data[*bytesRead], sizeof(unsigned char), 32, file);
*bytesRead = count;
if (count != size) TRACELOG(LOG_WARNING, "FILEIO: [%s] File partially loaded", fileName); if (ferror(file))
else TRACELOG(LOG_INFO, "FILEIO: [%s] File loaded successfully", fileName); {
TRACELOG(LOG_WARNING, "FILEIO: [%s] Failed to read file", fileName);
RL_FREE(data);
data = NULL;
break;
} }
else TRACELOG(LOG_WARNING, "FILEIO: [%s] Failed to read file", fileName); }
if (data != NULL) TRACELOG(LOG_INFO, "FILEIO: [%s] File loaded successfully", fileName);
fclose(file); fclose(file);
} }