From be7ac493d031b47dd8890817df0f018eb8ff1cfa Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Fri, 24 Dec 2021 16:19:02 +0800
Subject: [PATCH] merge bitcoin#24167: consistently use fsbridge:: for ifstream
 / ofstream

---
 src/bench/bench.cpp             | 4 ++--
 src/bitcoin-tx.cpp              | 3 ++-
 src/fs.cpp                      | 4 +++-
 src/qt/psbtoperationsdialog.cpp | 2 +-
 src/qt/sendcoinsdialog.cpp      | 2 +-
 src/qt/walletframe.cpp          | 2 +-
 src/test/fuzz/fuzz.cpp          | 2 +-
 src/test/script_tests.cpp       | 2 +-
 src/util/system.cpp             | 2 +-
 9 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/src/bench/bench.cpp b/src/bench/bench.cpp
index 0cfc1e23fa..011bed4206 100644
--- a/src/bench/bench.cpp
+++ b/src/bench/bench.cpp
@@ -5,11 +5,11 @@
 #include <bench/bench.h>
 
 #include <chainparams.h>
+#include <fs.h>
 #include <test/util/setup_common.h>
 #include <validation.h>
 
 #include <algorithm>
-#include <assert.h>
 #include <iostream>
 #include <regex>
 
@@ -23,7 +23,7 @@ void GenerateTemplateResults(const std::vector<ankerl::nanobench::Result>& bench
         // nothing to write, bail out
         return;
     }
-    std::ofstream fout(filename);
+    fsbridge::ofstream fout{fs::PathFromString(filename)};
     if (fout.is_open()) {
         ankerl::nanobench::render(tpl, benchmarkResults, fout);
     } else {
diff --git a/src/bitcoin-tx.cpp b/src/bitcoin-tx.cpp
index 9859c2a5f6..99889a3e96 100644
--- a/src/bitcoin-tx.cpp
+++ b/src/bitcoin-tx.cpp
@@ -13,6 +13,7 @@
 #include <consensus/consensus.h>
 #include <core_io.h>
 #include <key_io.h>
+#include <fs.h>
 #include <policy/policy.h>
 #include <primitives/transaction.h>
 #include <script/script.h>
@@ -162,7 +163,7 @@ static void RegisterLoad(const std::string& strInput)
     std::string key = strInput.substr(0, pos);
     std::string filename = strInput.substr(pos + 1, std::string::npos);
 
-    FILE *f = fopen(filename.c_str(), "r");
+    FILE *f = fsbridge::fopen(filename.c_str(), "r");
     if (!f) {
         std::string strErr = "Cannot open file " + filename;
         throw std::runtime_error(strErr);
diff --git a/src/fs.cpp b/src/fs.cpp
index 160be41f2b..0551c95cef 100644
--- a/src/fs.cpp
+++ b/src/fs.cpp
@@ -7,7 +7,6 @@
 #ifndef WIN32
 #include <cstring>
 #include <fcntl.h>
-#include <string>
 #include <sys/file.h>
 #include <sys/utsname.h>
 #include <unistd.h>
@@ -20,6 +19,9 @@
 #include <windows.h>
 #endif
 
+#include <cassert>
+#include <string>
+
 namespace fsbridge {
 
 FILE *fopen(const fs::path& p, const char *mode)
diff --git a/src/qt/psbtoperationsdialog.cpp b/src/qt/psbtoperationsdialog.cpp
index ed555379a4..7c550f274f 100644
--- a/src/qt/psbtoperationsdialog.cpp
+++ b/src/qt/psbtoperationsdialog.cpp
@@ -150,7 +150,7 @@ void PSBTOperationsDialog::saveTransaction() {
     if (filename.isEmpty()) {
         return;
     }
-    std::ofstream out(filename.toLocal8Bit().data(), std::ofstream::out | std::ofstream::binary);
+    fsbridge::ofstream out{filename.toLocal8Bit().data(), fsbridge::ofstream::out | fsbridge::ofstream::binary};
     out << ssTx.str();
     out.close();
     showStatus(tr("PSBT saved to disk."), StatusLevel::INFO);
diff --git a/src/qt/sendcoinsdialog.cpp b/src/qt/sendcoinsdialog.cpp
index 6ce17d274c..cab794a071 100644
--- a/src/qt/sendcoinsdialog.cpp
+++ b/src/qt/sendcoinsdialog.cpp
@@ -521,7 +521,7 @@ void SendCoinsDialog::sendButtonClicked([[maybe_unused]] bool checked)
             if (filename.isEmpty()) {
                 return;
             }
-            std::ofstream out(filename.toLocal8Bit().data(), std::ofstream::out | std::ofstream::binary);
+            fsbridge::ofstream out{filename.toLocal8Bit().data(), fsbridge::ofstream::out | fsbridge::ofstream::binary};
             out << ssTx.str();
             out.close();
             Q_EMIT message(tr("PSBT saved"), "PSBT saved to disk", CClientUIInterface::MSG_INFORMATION);
diff --git a/src/qt/walletframe.cpp b/src/qt/walletframe.cpp
index 67d2b112e1..7b2a9fa7a9 100644
--- a/src/qt/walletframe.cpp
+++ b/src/qt/walletframe.cpp
@@ -285,7 +285,7 @@ void WalletFrame::gotoLoadPSBT(bool from_clipboard)
             Q_EMIT message(tr("Error"), tr("PSBT file must be smaller than 100 MiB"), CClientUIInterface::MSG_ERROR);
             return;
         }
-        std::ifstream in(filename.toLocal8Bit().data(), std::ios::binary);
+        fsbridge::ifstream in{filename.toLocal8Bit().data(), std::ios::binary};
         data = std::string(std::istreambuf_iterator<char>{in}, {});
     }
 
diff --git a/src/test/fuzz/fuzz.cpp b/src/test/fuzz/fuzz.cpp
index 8a78ee8149..402d089d05 100644
--- a/src/test/fuzz/fuzz.cpp
+++ b/src/test/fuzz/fuzz.cpp
@@ -59,7 +59,7 @@ void initialize()
     }
     if (const char* out_path = std::getenv("WRITE_ALL_FUZZ_TARGETS_AND_ABORT")) {
         std::cout << "Writing all fuzz target names to '" << out_path << "'." << std::endl;
-        std::ofstream out_stream(out_path, std::ios::binary);
+        fsbridge::ofstream out_stream{out_path, std::ios::binary};
         for (const auto& t : FuzzTargets()) {
             if (std::get<2>(t.second)) continue;
             out_stream << t.first << std::endl;
diff --git a/src/test/script_tests.cpp b/src/test/script_tests.cpp
index 785cb375a6..4c98149d2e 100644
--- a/src/test/script_tests.cpp
+++ b/src/test/script_tests.cpp
@@ -879,7 +879,7 @@ BOOST_AUTO_TEST_CASE(script_build)
     }
 
 #ifdef UPDATE_JSON_TESTS
-    FILE* file = fopen("script_tests.json.gen", "w");
+    FILE* file = fsbridge::fopen("script_tests.json.gen", "w");
     fputs(strGen.c_str(), file);
     fclose(file);
 #endif
diff --git a/src/util/system.cpp b/src/util/system.cpp
index 6ad54b010a..a28e5eafb1 100644
--- a/src/util/system.cpp
+++ b/src/util/system.cpp
@@ -167,7 +167,7 @@ bool CheckDiskSpace(const fs::path& dir, uint64_t additional_bytes)
 }
 
 std::streampos GetFileSize(const char* path, std::streamsize max) {
-    std::ifstream file(path, std::ios::binary);
+    fsbridge::ifstream file{path, std::ios::binary};
     file.ignore(max);
     return file.gcount();
 }