diff options
| author | Riccardo Spagni <ric@spagni.net> | 2017-06-18 17:26:08 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2017-06-18 17:26:08 +0200 |
| commit | ae5f7c71d790a48ca696644997a791ee12973423 (patch) | |
| tree | ab17a0843d82f9ee641fa06b501e2e1f2db2e0d9 /src | |
| parent | Merge pull request #2070 (diff) | |
| parent | Add readline support to cli (diff) | |
| download | monero-ae5f7c71d790a48ca696644997a791ee12973423.tar.xz | |
Merge pull request #2074
e1f3dfcc Add readline support to cli (jethro)
Diffstat (limited to 'src')
| -rw-r--r-- | src/common/command_line.cpp | 7 | ||||
| -rw-r--r-- | src/common/password.cpp | 7 |
2 files changed, 14 insertions, 0 deletions
diff --git a/src/common/command_line.cpp b/src/common/command_line.cpp index f71b3e576..8c2796bbe 100644 --- a/src/common/command_line.cpp +++ b/src/common/command_line.cpp @@ -37,6 +37,10 @@ #include "cryptonote_config.h" #include "string_tools.h" +#ifdef HAVE_READLINE + #include "readline_buffer.h" +#endif + namespace command_line { namespace @@ -49,6 +53,9 @@ namespace command_line std::string input_line(const std::string& prompt) { +#ifdef HAVE_READLINE + rdln::suspend_readline pause_readline; +#endif std::cout << prompt; std::string buf; diff --git a/src/common/password.cpp b/src/common/password.cpp index bdc9c69c0..5c04023f4 100644 --- a/src/common/password.cpp +++ b/src/common/password.cpp @@ -42,6 +42,10 @@ #include <unistd.h> #endif +#ifdef HAVE_READLINE + #include "readline_buffer.h" +#endif + namespace { #if defined(_WIN32) @@ -238,6 +242,9 @@ namespace tools boost::optional<password_container> password_container::prompt(const bool verify, const char *message) { +#ifdef HAVE_READLINE + rdln::suspend_readline pause_readline; +#endif password_container pass1{}; password_container pass2{}; if (is_cin_tty() ? read_from_tty(verify, message, pass1.m_password, pass2.m_password) : read_from_file(pass1.m_password)) |