diff options
Diffstat (limited to 'src/wallet/load.cpp')
| -rw-r--r-- | src/wallet/load.cpp | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/src/wallet/load.cpp b/src/wallet/load.cpp index e6f96074d5..633d8c5450 100644 --- a/src/wallet/load.cpp +++ b/src/wallet/load.cpp @@ -19,6 +19,8 @@ #include <univalue.h> +#include <system_error> + namespace wallet { bool VerifyWallets(WalletContext& context) { @@ -26,14 +28,16 @@ bool VerifyWallets(WalletContext& context) ArgsManager& args = *Assert(context.args); if (args.IsArgSet("-walletdir")) { - fs::path wallet_dir = fs::PathFromString(args.GetArg("-walletdir", "")); - boost::system::error_code error; + const fs::path wallet_dir{args.GetPathArg("-walletdir")}; + std::error_code error; // The canonical path cleans the path, preventing >1 Berkeley environment instances for the same directory - fs::path canonical_wallet_dir = fs::canonical(wallet_dir, error).remove_trailing_separator(); - if (error || !fs::exists(wallet_dir)) { + // It also lets the fs::exists and fs::is_directory checks below pass on windows, since they return false + // if a path has trailing slashes, and it strips trailing slashes. + fs::path canonical_wallet_dir = fs::canonical(wallet_dir, error); + if (error || !fs::exists(canonical_wallet_dir)) { chain.initError(strprintf(_("Specified -walletdir \"%s\" does not exist"), fs::PathToString(wallet_dir))); return false; - } else if (!fs::is_directory(wallet_dir)) { + } else if (!fs::is_directory(canonical_wallet_dir)) { chain.initError(strprintf(_("Specified -walletdir \"%s\" is not a directory"), fs::PathToString(wallet_dir))); return false; // The canonical path transforms relative paths into absolute ones, so we check the non-canonical version |