nerdcruft/libcruft-util
1
0
Fork 0
Code Issues Releases Activity

Add O_BINARY to open for Win32

Browse Source
This commit is contained in:
Danny Robson 2012-05-08 15:04:31 +10:00
parent 0b7e3838cd
commit 8624cf7b06
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
io.cpp
View File

@ -21,6 +21,7 @@
#include "debug.hpp" #include "debug.hpp"
#include "except.hpp" #include "except.hpp"
#include "platform.hpp"
#include <cstdio> #include <cstdio>
#include <sys/types.h> #include <sys/types.h>
@ -58,7 +59,7 @@ util::slurp (const boost::filesystem::path& path) {
ssize_t consumed = read (fd, cursor, remaining); ssize_t consumed = read (fd, cursor, remaining);
if (consumed == -1) if (consumed == -1)
throw errno_error(); throw errno_error();
check_hard ( consumed >= 0); check_hard ( consumed > 0);
check_hard ((size_t)consumed <= remaining); check_hard ((size_t)consumed <= remaining);
remaining -= (size_t)consumed; remaining -= (size_t)consumed;
@ -78,7 +79,11 @@ fd_ref::fd_ref (int _fd):
fd_ref::fd_ref (const boost::filesystem::path &path): fd_ref::fd_ref (const boost::filesystem::path &path):
#ifdef PLATFORM_WIN32
fd (open (path.string ().c_str (), O_RDONLY | O_BINARY))
#else
fd (open (path.string ().c_str (), O_RDONLY)) fd (open (path.string ().c_str (), O_RDONLY))
#endif
{ {
if (fd < 0) if (fd < 0)
throw path_error (path); throw path_error (path);