fs: consistently use fsbridge for {i,o}fstream

fanquake · fanquake · commit 21f781ad7921 · 2022-01-26T22:08:19.000+08:00
Part of bitcoin#20744, but this can be done now, and will simplify the diff.
diff --git a/src/bench/bench.cpp b/src/bench/bench.cpp
@@ -4,10 +4,10 @@
 
 #include <bench/bench.h>
 
+#include <fs.h>
 #include <test/util/setup_common.h>
 
 #include <chrono>
-#include <fstream>
 #include <functional>
 #include <iostream>
 #include <map>
@@ -29,7 +29,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/qt/psbtoperationsdialog.cpp b/src/qt/psbtoperationsdialog.cpp
@@ -158,7 +158,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
@@ -509,7 +509,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
@@ -210,7 +210,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
@@ -80,7 +80,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/util/system.cpp b/src/util/system.cpp
@@ -146,7 +146,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();
 }

Original file line number	Diff line number	Diff line change
`@@ -158,7 +158,7 @@ void PSBTOperationsDialog::saveTransaction() {`
`158`	`158`	`if (filename.isEmpty()) {`
`159`	`159`	`return;`
`160`	`160`	`}`
`161`		`- std::ofstream out(filename.toLocal8Bit().data(), std::ofstream::out \| std::ofstream::binary);`
	`161`	`+ fsbridge::ofstream out{filename.toLocal8Bit().data(), fsbridge::ofstream::out \| fsbridge::ofstream::binary};`
`162`	`162`	`out << ssTx.str();`
`163`	`163`	`out.close();`
`164`	`164`	`showStatus(tr("PSBT saved to disk."), StatusLevel::INFO);`
Original file line number	Diff line number	Diff line change
`@@ -509,7 +509,7 @@ void SendCoinsDialog::sendButtonClicked([[maybe_unused]] bool checked)`
`509`	`509`	`if (filename.isEmpty()) {`
`510`	`510`	`return;`
`511`	`511`	`}`
`512`		`- std::ofstream out(filename.toLocal8Bit().data(), std::ofstream::out \| std::ofstream::binary);`
	`512`	`+ fsbridge::ofstream out{filename.toLocal8Bit().data(), fsbridge::ofstream::out \| fsbridge::ofstream::binary};`
`513`	`513`	`out << ssTx.str();`
`514`	`514`	`out.close();`
`515`	`515`	`Q_EMIT message(tr("PSBT saved"), "PSBT saved to disk", CClientUIInterface::MSG_INFORMATION);`
Original file line number	Diff line number	Diff line change
`@@ -210,7 +210,7 @@ void WalletFrame::gotoLoadPSBT(bool from_clipboard)`
`210`	`210`	`Q_EMIT message(tr("Error"), tr("PSBT file must be smaller than 100 MiB"), CClientUIInterface::MSG_ERROR);`
`211`	`211`	`return;`
`212`	`212`	`}`
`213`		`- std::ifstream in(filename.toLocal8Bit().data(), std::ios::binary);`
	`213`	`+ fsbridge::ifstream in{filename.toLocal8Bit().data(), std::ios::binary};`
`214`	`214`	`data = std::string(std::istreambuf_iterator<char>{in}, {});`
`215`	`215`	`}`
`216`	`216`
Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ void initialize()`
`80`	`80`	`}`
`81`	`81`	`if (const char* out_path = std::getenv("WRITE_ALL_FUZZ_TARGETS_AND_ABORT")) {`
`82`	`82`	`std::cout << "Writing all fuzz target names to '" << out_path << "'." << std::endl;`
`83`		`- std::ofstream out_stream(out_path, std::ios::binary);`
	`83`	`+ fsbridge::ofstream out_stream{out_path, std::ios::binary};`
`84`	`84`	`for (const auto& t : FuzzTargets()) {`
`85`	`85`	`if (std::get<2>(t.second)) continue;`
`86`	`86`	`out_stream << t.first << std::endl;`
Original file line number	Diff line number	Diff line change
`@@ -146,7 +146,7 @@ bool CheckDiskSpace(const fs::path& dir, uint64_t additional_bytes)`
`146`	`146`	`}`
`147`	`147`
`148`	`148`	`std::streampos GetFileSize(const char* path, std::streamsize max) {`
`149`		`- std::ifstream file(path, std::ios::binary);`
	`149`	`+ fsbridge::ifstream file{path, std::ios::binary};`
`150`	`150`	`file.ignore(max);`
`151`	`151`	`return file.gcount();`
`152`	`152`	`}`