mirrors/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2024-11-20 02:25:40 +01:00
Code Issues Projects Releases Wiki Activity

add newline after -stdin*

Browse Source
This commit is contained in:
Karl-Johan Alm 2019-02-14 14:51:28 +09:00
parent 7f11fba2e3
commit 50c4afa3c4
No known key found for this signature in database
GPG Key ID: 57AF762DB3353322
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/bitcoin-cli.cpp
View File

@ -421,6 +421,9 @@ static int CommandLineRPC(int argc, char *argv[])
if (!std::getline(std::cin, rpcPass)) {
throw std::runtime_error("-stdinrpcpass specified but failed to read from standard input");
}
if (StdinTerminal()) {
fputc('\n', stdout);
}
gArgs.ForceSetArg("-rpcpassword", rpcPass);
}
std::vector<std::string> args = std::vector<std::string>(&argv[1], &argv[argc]);
@ -437,6 +440,9 @@ static int CommandLineRPC(int argc, char *argv[])
if (!std::getline(std::cin, walletPass)) {
throw std::runtime_error("-stdinwalletpassphrase specified but failed to read from standard input");
}
if (StdinTerminal()) {
fputc('\n', stdout);
}
args.insert(args.begin() + 1, walletPass);
}
if (gArgs.GetBoolArg("-stdin", false)) {
@ -445,6 +451,9 @@ static int CommandLineRPC(int argc, char *argv[])
while (std::getline(std::cin, line)) {
args.push_back(line);
}
if (StdinTerminal()) {
fputc('\n', stdout);
}
}
std::unique_ptr<BaseRequestHandler> rh;
std::string method;