Mirrors
/
monero
mirror of https://github.com/monero-project/monero.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Construct on first use for completion_commands

This commit is contained in:
Jethro Grassie 2017-08-16 09:34:32 -04:00
parent 67dd4933e6
commit 1249a2a550
No known key found for this signature in database
GPG Key ID: DE8ED755616565BB
2 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
contrib/epee/include/readline_buffer.h
View File

@ -21,23 +21,15 @@ namespace rdln
} }
void get_line(std::string& line) const; void get_line(std::string& line) const;
void set_prompt(const std::string& prompt); void set_prompt(const std::string& prompt);
static void add_completion(const std::string& command) static void add_completion(const std::string& command);
{ static const std::vector<std::string>& get_completions();
if(std::find(completion_commands.begin(), completion_commands.end(), command) != completion_commands.end())
return;
completion_commands.push_back(command);
}
static const std::vector<std::string>& get_completions()
{
return completion_commands;
}
protected: protected:
virtual int sync(); virtual int sync();
private: private:
std::streambuf* m_cout_buf; std::streambuf* m_cout_buf;
static std::vector<std::string> completion_commands; static std::vector<std::string>& completion_commands();
}; };
class suspend_readline class suspend_readline

24
contrib/epee/src/readline_buffer.cpp
View File

@ -14,10 +14,8 @@ static void remove_line_handler();
static std::string last_line; static std::string last_line;
static std::string last_prompt; static std::string last_prompt;
std::mutex line_mutex, sync_mutex, process_mutex; static std::mutex line_mutex, sync_mutex, process_mutex;
std::condition_variable have_line; static std::condition_variable have_line;
std::vector<std::string> rdln::readline_buffer::completion_commands = {"exit"};
namespace namespace
{ {
@ -43,6 +41,12 @@ rdln::suspend_readline::~suspend_readline()
m_buffer->start(); m_buffer->start();
} }
std::vector<std::string>& rdln::readline_buffer::completion_commands()
{
static std::vector<std::string> commands = {"exit"};
return commands;
}
rdln::readline_buffer::readline_buffer() rdln::readline_buffer::readline_buffer()
: std::stringbuf(), m_cout_buf(NULL) : std::stringbuf(), m_cout_buf(NULL)
{ {
@ -88,6 +92,18 @@ void rdln::readline_buffer::set_prompt(const std::string& prompt)
rl_redisplay(); rl_redisplay();
} }
void rdln::readline_buffer::add_completion(const std::string& command)
{
if(std::find(completion_commands().begin(), completion_commands().end(), command) != completion_commands().end())
return;
completion_commands().push_back(command);
}
const std::vector<std::string>& rdln::readline_buffer::get_completions()
{
return completion_commands();
}
int rdln::readline_buffer::process() int rdln::readline_buffer::process()
{ {
process_mutex.lock(); process_mutex.lock();