diff options
Diffstat (limited to 'util/file.h')
| -rw-r--r-- | util/file.h | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/util/file.h b/util/file.h index 347e2d6..0302290 100644 --- a/util/file.h +++ b/util/file.h @@ -27,6 +27,8 @@ #include <windows.h> #endif +#include "text.h" + namespace mongo { #ifndef __sunos__ @@ -47,7 +49,6 @@ public: #if defined(_WIN32) #include <io.h> -std::wstring toWideString(const char *s); class File : public FileInterface { HANDLE fd; @@ -68,9 +69,9 @@ public: fd = INVALID_HANDLE_VALUE; } void open(const char *filename, bool readOnly=false ) { - std::wstring filenamew = toWideString(filename); fd = CreateFile( - filenamew.c_str(), ( readOnly ? 0 : GENERIC_WRITE ) | GENERIC_READ, FILE_SHARE_READ, + toNativeString(filename).c_str(), + ( readOnly ? 0 : GENERIC_WRITE ) | GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); if( !is_open() ) { out() << "CreateFile failed " << filename << endl; @@ -118,7 +119,7 @@ class File : public FileInterface { void err(bool ok) { if( !ok && !_bad ) { _bad = true; - log() << "File I/O " << OUTPUT_ERRNO << '\n'; + log() << "File I/O " << errnoWithDescription() << '\n'; } } public: @@ -137,9 +138,11 @@ public: #endif void open(const char *filename, bool readOnly=false ) { - fd = ::open(filename, O_CREAT | ( readOnly ? 0 : O_RDWR ) | O_NOATIME, S_IRUSR | S_IWUSR); + fd = ::open(filename, + O_CREAT | ( readOnly ? 0 : ( O_RDWR | O_NOATIME ) ) , + S_IRUSR | S_IWUSR); if ( fd <= 0 ) { - out() << "couldn't open " << filename << ' ' << OUTPUT_ERRNO << endl; + out() << "couldn't open " << filename << ' ' << errnoWithDescription() << endl; return; } _bad = false; |