doylet/Dqn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix ReadEntireFile bug

Browse Source
This commit is contained in:
Doyle T 2018-07-10 15:52:12 +10:00
parent 7785e35f91
commit 25410c7aac
2 changed files with 13 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DqnUnitTest.cpp
View File

@ -1,7 +1,9 @@
#if defined(DQN_IS_WIN32)
#define WIN32_MEAN_AND_LEAN #define WIN32_MEAN_AND_LEAN
#include <Winsock2.h> #include <Winsock2.h>
#include <ws2tcpip.h> #include <ws2tcpip.h>
#include <Windows.h> #include <Windows.h>
#endif
#if defined(__linux__) #if defined(__linux__)
#define HANDMADE_MATH_NO_SSE #define HANDMADE_MATH_NO_SSE

30
dqn.h
View File

@ -8766,28 +8766,19 @@ DQN_FILE__LIST_DIR(DqnFile__PlatformListDir)
FILE_SCOPE bool DqnFile__UnixGetFileSize(char const *path, usize *size) FILE_SCOPE bool DqnFile__UnixGetFileSize(char const *path, usize *size)
{ {
struct stat fileStat = {}; struct stat fileStat = {};
if (stat(path, &fileStat)) stat(path, &fileStat);
{
// TODO(doyle): Logging
return false;
}
*size = fileStat.st_size; *size = fileStat.st_size;
if (*size != 0)
return true;
// NOTE: Can occur in some instances where files are generated on demand, i.e. /proc/cpuinfo. // NOTE: Can occur in some instances where files are generated on demand, i.e. /proc/cpuinfo.
// But there can also be zero-byte files, we can't be sure. So manual check by counting bytes // But there can also be zero-byte files, we can't be sure. So manual check by counting bytes
if (*size == 0) if (FILE *file = fopen(path, "rb"))
{ {
FILE *file = fopen(path, "r");
DQN_DEFER(fclose(file)); DQN_DEFER(fclose(file));
u64 fileSizeInBytes = 0; while (fgetc(file) != EOF)
*size++;
char c = fgetc(file);
while (c != EOF)
{
fileSizeInBytes++;
c = fgetc(file);
}
} }
return true; return true;
@ -8849,6 +8840,7 @@ DqnFile__UnixOpen(char const *path, DqnFile *file, u32 flags, DqnFile::Action ac
return false; return false;
} }
file->handle = fopen(path, mode);
file->flags = flags; file->flags = flags;
return true; return true;
} }
@ -9058,7 +9050,7 @@ u8 *DqnFile::ReadEntireFile(char const *path, usize *bufSize, DqnMemAPI *api)
if (DqnFile::ReadEntireFile(path, buf, requiredSize, &bytesRead)) if (DqnFile::ReadEntireFile(path, buf, requiredSize, &bytesRead))
{ {
*bufSize = requiredSize; *bufSize = requiredSize;
DQN_ASSERT(bytesRead == requiredSize); DQN_ASSERTM(bytesRead == requiredSize, "%zu != %zu", bytesRead, requiredSize);
return buf; return buf;
} }
@ -9108,7 +9100,7 @@ bool DqnFile::ReadEntireFile(const char *path, u8 *buf, usize bufSize, usize *by
} }
*bytesRead = file.Read(buf, file.size); *bytesRead = file.Read(buf, file.size);
DQN_ASSERT(*bytesRead == file.size); DQN_ASSERTM(*bytesRead == file.size, "%zu != %zu", *bytesRead, file.size);
cleanup: cleanup:
file.Close(); file.Close();
@ -9677,7 +9669,7 @@ DQN_FILE_SCOPE i32 DqnAtomic_Add32(i32 volatile *src, i32 value)
// XPlatform > #DqnOS // XPlatform > #DqnOS
// ================================================================================================= // =================================================================================================
#if defined(DQN_IS_UNIX) #if defined(DQN_IS_UNIX)
include <sys/mman.h> #include <sys/mman.h>
#endif #endif
void *DqnOS_VAlloc(isize size, void *baseAddress) void *DqnOS_VAlloc(isize size, void *baseAddress)