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

Basic file open/close/read implemented in Unix

Browse Source
This commit is contained in:
Doyle 2017-06-21 18:05:30 +10:00
parent 036afb9b10
commit 245e6b11f1
1 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
dqn.h
View File

@ -859,7 +859,7 @@ DQN_FILE_SCOPE bool DqnFile_OpenW(const wchar_t *const path, DqnFile *const fi
DQN_FILE_SCOPE size_t DqnFile_Write(const DqnFile *const file, const u8 *const buffer, const size_t numBytesToWrite, const size_t fileOffset); DQN_FILE_SCOPE size_t DqnFile_Write(const DqnFile *const file, const u8 *const buffer, const size_t numBytesToWrite, const size_t fileOffset);
// Return the number of bytes read // Return the number of bytes read
DQN_FILE_SCOPE size_t DqnFile_Read (const DqnFile file, const u8 *const buffer, const size_t numBytesToRead); DQN_FILE_SCOPE size_t DqnFile_Read (const DqnFile file, u8 *const buffer, const size_t numBytesToRead);
DQN_FILE_SCOPE void DqnFile_Close(DqnFile *const file); DQN_FILE_SCOPE void DqnFile_Close(DqnFile *const file);
// Return an array of strings of the files in the directory in UTF-8. numFiles // Return an array of strings of the files in the directory in UTF-8. numFiles
@ -3732,13 +3732,13 @@ DQN_FILE_SCOPE size_t DqnFile_Write(const DqnFile *const file,
return numBytesWritten; return numBytesWritten;
} }
DQN_FILE_SCOPE size_t DqnFile_Read(const DqnFile file, const u8 *const buffer, DQN_FILE_SCOPE size_t DqnFile_Read(DqnFile file, u8 *const buffer,
const size_t numBytesToRead) const size_t numBytesToRead)
{ {
size_t numBytesRead = 0; size_t numBytesRead = 0;
#ifdef DQN_WIN32_PLATFORM
if (file.handle && buffer) if (file.handle && buffer)
{ {
#if defined(DQN_WIN32_PLATFORM)
DWORD bytesToRead = (DWORD)numBytesToRead; DWORD bytesToRead = (DWORD)numBytesToRead;
DWORD bytesRead = 0; DWORD bytesRead = 0;
HANDLE win32Handle = file.handle; HANDLE win32Handle = file.handle;
@ -3753,24 +3753,39 @@ DQN_FILE_SCOPE size_t DqnFile_Read(const DqnFile file, const u8 *const buffer,
DQN_WIN32_ERROR_BOX("ReadFile() failed.", NULL); DQN_WIN32_ERROR_BOX("ReadFile() failed.", NULL);
} }
#elif defined(DQN_UNIX_PLATFORM)
// TODO(doyle): Syscall version
const size_t ITEMS_TO_READ = 1;
if (fread(buffer, numBytesToRead, ITEMS_TO_READ, (FILE *)file.handle) ==
ITEMS_TO_READ)
{
rewind((FILE *)file.handle);
numBytesRead = ITEMS_TO_READ * numBytesToRead;
} }
else
{
// TODO(doyle): Logging, failed read
}
#else
DQN_ASSERT_MSG(DQN_INVALID_CODE_PATH, "Non Win32/Unix path not implemented");
#endif #endif
}
return numBytesRead; return numBytesRead;
} }
DQN_FILE_SCOPE void DqnFile_Close(DqnFile *const file) DQN_FILE_SCOPE void DqnFile_Close(DqnFile *const file)
{ {
#ifdef DQN_WIN32_PLATFORM
if (file && file->handle) if (file && file->handle)
{ {
#if defined(DQN_WIN32_PLATFORM)
CloseHandle(file->handle); CloseHandle(file->handle);
#elif defined(DQN_UNIX_PLATFORM)
fclose((FILE *)file->handle);
#endif
file->handle = NULL; file->handle = NULL;
file->size = 0; file->size = 0;
file->permissionFlags = 0; file->permissionFlags = 0;
} }
#else
DQN_ASSERT_MSG(DQN_INVALID_CODE_PATH, "Non Win32 path not implemented");
#endif
} }
DQN_FILE_SCOPE char **DqnDir_Read(const char *const dir, u32 *const numFiles) DQN_FILE_SCOPE char **DqnDir_Read(const char *const dir, u32 *const numFiles)