Merge bitcoin#15468: wallet: Use fsbridge::ifstream to fix Windows path issue

laanwj · laanwj · commit a4f9c024c650 · 2019-02-27T12:05:58.000+01:00
6ad79cb wallet: Use fsbridge::ifstream to fix Windows path issue (Chun Kuan Lee) Pull request description: Fix bitcoin#15460 Tree-SHA512: 1dab04184608543d49c86cbcfb679d63d35cb7bf3bde2e2d9ddf25ec8977de42b7131db5e81a305f3452858079dbcf68f6ad4624c89575d3d7e5b550687fc6ad
diff --git a/src/fs.cpp b/src/fs.cpp
@@ -160,6 +160,7 @@ static std::string openmodeToStr(std::ios_base::openmode mode)
 void ifstream::open(const fs::path& p, std::ios_base::openmode mode)
 {
     close();
+    mode |= std::ios_base::in;
     m_file = fsbridge::fopen(p, openmodeToStr(mode).c_str());
     if (m_file == nullptr) {
         return;
@@ -183,6 +184,7 @@ void ifstream::close()
 void ofstream::open(const fs::path& p, std::ios_base::openmode mode)
 {
     close();
+    mode |= std::ios_base::out;
     m_file = fsbridge::fopen(p, openmodeToStr(mode).c_str());
     if (m_file == nullptr) {
         return;
diff --git a/src/wallet/walletutil.cpp b/src/wallet/walletutil.cpp
@@ -35,7 +35,7 @@ static bool IsBerkeleyBtree(const fs::path& path)
     boost::system::error_code ec;
     if (fs::file_size(path, ec) < 4096) return false;
 
-    fs::ifstream file(path.string(), std::ios::binary);
+    fsbridge::ifstream file(path, std::ios::binary);
     if (!file.is_open()) return false;
 
     file.seekg(12, std::ios::beg); // Magic bytes start at offset 12
