Peerplays_Blockchain/peerplays-fc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

FC Updates from BitShares and myself #21

Closed
nathanielhourt wants to merge 687 commits from dapp-support into latest-fc
pull from: dapp-support
merge into: Peerplays_Blockchain:latest-fc
Conversation 4 Commits 687 Files changed 314 +8 -18
2 changed files with 8 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 79cf3d2b3a - Show all commits

4
.gitmodules vendored
View file

@ -8,5 +8,5 @@
path = vendor/websocketpp path = vendor/websocketpp
url = https://github.com/zaphoyd/websocketpp.git url = https://github.com/zaphoyd/websocketpp.git
[submodule "vendor/editline"] [submodule "vendor/editline"]
path = vendor/editline path = vendor/editline
url = https://github.com/troglobit/editline.git url = https://github.com/troglobit/editline.git

22
src/rpc/cli.cpp
View file

@ -111,15 +111,6 @@ void cli::run()
} }
} }
char * dupstr (const char* s) {
char *r;
r = (char*) malloc ((strlen (s) + 1));
strcpy (r, s);
return (r);
}
/**** /****
* @brief loop through list of commands, attempting to find a match * @brief loop through list of commands, attempting to find a match
* @param token what the user typed * @param token what the user typed
@ -133,11 +124,11 @@ static char *my_rl_complete(char *token, int *match)
const char* method_name; const char* method_name;
auto& cmd = cli_commands(); auto& cmd = cli_commands();
for (auto it = cmd.begin(); it != cmd.end(); it++) { for (auto it : cmd) {
int partlen = strlen (token); /* Part of token */ int partlen = strlen (token); /* Part of token */
if (!strncmp ((*it).c_str(), token, partlen)) { if (!strncmp (it.c_str(), token, partlen)) {
method_name = (*it).c_str(); method_name = it.c_str();
matchlen = partlen; matchlen = partlen;
count ++; count ++;
} }
@ -166,9 +157,9 @@ static int cli_completion(char *token, char ***av)
num = cmd.size(); num = cmd.size();
copy = (char **) malloc (num * sizeof(char *)); copy = (char **) malloc (num * sizeof(char *));
for (auto it = cmd.begin(); it != cmd.end(); ++it) { for (auto it : cmd) {
if (!strncmp ((*it).c_str(), token, strlen (token))) { if (!strncmp (it.c_str(), token, strlen (token))) {
copy[total] = strdup ( (*it).c_str() ); copy[total] = strdup ( it.c_str() );
total ++; total ++;
} }
} }
@ -209,7 +200,6 @@ void cli::getline( const fc::string& prompt, fc::string& line)
line_read = readline(prompt.c_str()); line_read = readline(prompt.c_str());
if( line_read == nullptr ) if( line_read == nullptr )
FC_THROW_EXCEPTION( fc::eof_exception, "" ); FC_THROW_EXCEPTION( fc::eof_exception, "" );
//el_bind_key( '\t', rl_complete );
if( *line_read ) if( *line_read )
add_history(line_read); add_history(line_read);
line = line_read; line = line_read;