josh/jes-ruby
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix reading files without performing newline conversion on Windows

Browse Source
This commit is contained in:
Josh Holtrop 2014-06-23 11:51:08 -04:00
parent dfbbd04862
commit 77022ae0b5
2 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/lib/include/jes/Core.h
View File

@ -5,6 +5,12 @@
#include "jes/Path.h" #include "jes/Path.h"
#include <string> #include <string>
#ifdef _WIN32
#define JES_O_BINARY O_BINARY
#else
#define JES_O_BINARY 0
#endif
namespace jes namespace jes
{ {
typedef Ref<std::string> StringRef; typedef Ref<std::string> StringRef;

15
src/lib/src/FileReader.cc
View File

@ -1,3 +1,4 @@
#include "jes.h"
#include "jes/FileReader.h" #include "jes/FileReader.h"
#include "jes/Text.h" #include "jes/Text.h"
#include <sys/types.h> #include <sys/types.h>
@ -43,7 +44,7 @@ namespace jes
return true; return true;
} }
m_fd = open(fname, O_RDONLY); m_fd = open(fname, O_RDONLY | JES_O_BINARY);
if (m_fd < 0) if (m_fd < 0)
{ {
return false; return false;
@ -51,7 +52,17 @@ namespace jes
m_buf = new uint8_t[st.st_size]; m_buf = new uint8_t[st.st_size];
if (read(m_fd, m_buf, st.st_size) != st.st_size) off_t n_bytes_read = 0u;
for (;;)
{
off_t rd_size = read(m_fd, &m_buf[n_bytes_read], st.st_size - n_bytes_read);
if (rd_size <= 0)
break;
n_bytes_read += rd_size;
if (n_bytes_read >= st.st_size)
break;
}
if (n_bytes_read != st.st_size)
{ {
delete[] m_buf; delete[] m_buf;
m_buf = NULL; m_buf = NULL;