Replace Readline, bitshares-core issue 673 #14
Conversation
| list_index++; | ||
|
|
||
| if (strncmp (name, text, len) == 0) | ||
| return (dupstr(name)); |
There was a problem hiding this comment.
With this, the dupstr() function will no longer be used an should be removed as well.
src/rpc/cli.cpp
Outdated
| const char* method_name; | ||
|
|
||
| auto& cmd = cli_commands(); | ||
| for (auto it = cmd.begin(); it != cmd.end(); it++) { |
There was a problem hiding this comment.
Using a foreach loop over cmd would make the code look better. Same in next function.
There was a problem hiding this comment.
Switched to foreach in both places
src/rpc/cli.cpp
Outdated
|
|
||
| auto& cmd = cli_commands(); | ||
| for (auto it = cmd.begin(); it != cmd.end(); it++) { | ||
| int partlen = strlen (token); /* Part of token */ |
There was a problem hiding this comment.
Move this out of the loop. token is never modified, no need to re-count in every cycle.
There was a problem hiding this comment.
Moved partlen initialization to outside the loop
src/rpc/cli.cpp
Outdated
| @@ -201,7 +209,7 @@ void cli::getline( const fc::string& prompt, fc::string& line) | |||
| line_read = readline(prompt.c_str()); | |||
| if( line_read == nullptr ) | |||
| FC_THROW_EXCEPTION( fc::eof_exception, "" ); | |||
| rl_bind_key( '\t', rl_complete ); | |||
| //el_bind_key( '\t', rl_complete ); | |||
There was a problem hiding this comment.
Why is this commented out? Is \t the default?
There was a problem hiding this comment.
Yes, \t is the default. Removed the line.
There was a problem hiding this comment.
Please push your new commit :)
There was a problem hiding this comment.
Commit lost somewhere. Redone.
.gitmodules
Outdated
| @@ -7,3 +7,6 @@ | |||
| [submodule "vendor/websocketpp"] | |||
| path = vendor/websocketpp | |||
| url = https://github.com/zaphoyd/websocketpp.git | |||
| [submodule "vendor/editline"] | |||
| path = vendor/editline | |||
There was a problem hiding this comment.
Please replace the tabs with spaces.
src/rpc/cli.cpp
Outdated
| @@ -201,7 +209,7 @@ void cli::getline( const fc::string& prompt, fc::string& line) | |||
| line_read = readline(prompt.c_str()); | |||
| if( line_read == nullptr ) | |||
| FC_THROW_EXCEPTION( fc::eof_exception, "" ); | |||
| rl_bind_key( '\t', rl_complete ); | |||
| //el_bind_key( '\t', rl_complete ); | |||
There was a problem hiding this comment.
Please push your new commit :)
|
I lost a commit somehow. Changes have been redone. Note: The new editline library has a liberal license, but still requires documentation changes. See the license at https://github.com/troglobit/editline/blob/master/LICENSE |
|
Thanks! |
This is for the issue bitshares/bitshares-core#673
This is the Pull Request for the bitshares-fc portion. The submodule https://github.com/troglobit/editline was added to this library.
The related pull request that handles the bitshares-core portion is at bitshares/bitshares-core#685