diff options
author | warptangent <warptangent@inbox.com> | 2014-12-11 02:47:24 -0800 |
---|---|---|
committer | warptangent <warptangent@inbox.com> | 2014-12-11 02:52:48 -0800 |
commit | 95eb944eade434f86908262932ea991236820a61 (patch) | |
tree | 5a2817e69a7ee71b04501e189b6849d506515e32 /src/wallet | |
parent | version bump to 0.8.8.6 (diff) | |
download | monero-95eb944eade434f86908262932ea991236820a61.tar.xz |
Repeat prompt for wallet path if invalid
simplewallet run without a wallet path argument should prompt again if
an invalid path was entered.
Validity here currently means the string isn't empty.
Diffstat (limited to 'src/wallet')
-rw-r--r-- | src/wallet/wallet2.cpp | 5 | ||||
-rw-r--r-- | src/wallet/wallet2.h | 6 |
2 files changed, 11 insertions, 0 deletions
diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp index 163e19df4..2b84cbbf3 100644 --- a/src/wallet/wallet2.cpp +++ b/src/wallet/wallet2.cpp @@ -633,6 +633,11 @@ void wallet2::wallet_exists(const std::string& file_path, bool& keys_file_exists wallet_file_exists = boost::filesystem::exists(wallet_file, ignore); } //---------------------------------------------------------------------------------------------------- +bool wallet2::wallet_valid_path_format(const std::string& file_path) +{ + return !file_path.empty(); +} +//---------------------------------------------------------------------------------------------------- bool wallet2::parse_payment_id(const std::string& payment_id_str, crypto::hash& payment_id) { cryptonote::blobdata payment_id_data; diff --git a/src/wallet/wallet2.h b/src/wallet/wallet2.h index f22c5d79d..dface0a7d 100644 --- a/src/wallet/wallet2.h +++ b/src/wallet/wallet2.h @@ -225,6 +225,12 @@ namespace tools } static void wallet_exists(const std::string& file_path, bool& keys_file_exists, bool& wallet_file_exists); + /*! + * \brief Check if wallet file path is valid format + * \param file_path Wallet file path + * \return Whether path is valid format + */ + static bool wallet_valid_path_format(const std::string& file_path); static bool parse_payment_id(const std::string& payment_id_str, crypto::hash& payment_id); |