diff options
| author | Kiminuo <kiminuo@protonmail.com> | 2021-01-13 15:44:40 +0100 |
|---|---|---|
| committer | Kiminuo <kiminuo@protonmail.com> | 2021-01-15 22:48:15 +0100 |
| commit | da9caa1cedd69702aea44cb44b2fd0a2d6d56916 (patch) | |
| tree | fc2198dea8c7c5f0cd91b7df259afd1a4c90efd7 /src/wallet/wallet.cpp | |
| parent | 66576c4fd532ac18b8b355ea93d25581a2c15654 (diff) | |
| download | bitcoin-da9caa1cedd69702aea44cb44b2fd0a2d6d56916.tar.xz | |
Replace fs::absolute calls with AbsPathJoin calls
This adds better test coverage and will make it easier in #20744 to remove our dependency on the two-argument boost::filesystem::absolute() function which does not have a direct equivalent in C++17.
Diffstat (limited to 'src/wallet/wallet.cpp')
| -rw-r--r-- | src/wallet/wallet.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp index 918946f9e7..723552860a 100644 --- a/src/wallet/wallet.cpp +++ b/src/wallet/wallet.cpp @@ -3780,7 +3780,7 @@ std::unique_ptr<WalletDatabase> MakeWalletDatabase(const std::string& name, cons // 2. Path to an existing directory. // 3. Path to a symlink to a directory. // 4. For backwards compatibility, the name of a data file in -walletdir. - const fs::path& wallet_path = fs::absolute(name, GetWalletDir()); + const fs::path wallet_path = fsbridge::AbsPathJoin(GetWalletDir(), name); fs::file_type path_type = fs::symlink_status(wallet_path).type(); if (!(path_type == fs::file_not_found || path_type == fs::directory_file || (path_type == fs::symlink_file && fs::is_directory(wallet_path)) || |