diff options
| author | João Barbosa <[email protected]> | 2017-08-24 18:35:06 +0100 |
|---|---|---|
| committer | João Barbosa <[email protected]> | 2017-09-07 00:35:28 +0100 |
| commit | 769684132985cd67cbe8c7629a917aba6a333688 (patch) | |
| tree | 1b06c8376be8b76176de43c7c05167a418a99dfe /src | |
| parent | Merge #10838: (finally) remove getinfo (diff) | |
| download | discoin-769684132985cd67cbe8c7629a917aba6a333688.tar.xz discoin-769684132985cd67cbe8c7629a917aba6a333688.zip | |
Fix style in -stdin and -stdinrpcpass handling
Diffstat (limited to 'src')
| -rw-r--r-- | src/bitcoin-cli.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/bitcoin-cli.cpp b/src/bitcoin-cli.cpp index fca6083ea..3c94c99b3 100644 --- a/src/bitcoin-cli.cpp +++ b/src/bitcoin-cli.cpp @@ -296,19 +296,22 @@ int CommandLineRPC(int argc, char *argv[]) } std::string rpcPass; if (gArgs.GetBoolArg("-stdinrpcpass", false)) { - if(!std::getline(std::cin,rpcPass)) + if (!std::getline(std::cin, rpcPass)) { throw std::runtime_error("-stdinrpcpass specified but failed to read from standard input"); + } gArgs.ForceSetArg("-rpcpassword", rpcPass); } std::vector<std::string> args = std::vector<std::string>(&argv[1], &argv[argc]); if (gArgs.GetBoolArg("-stdin", false)) { // Read one arg per line from stdin and append std::string line; - while (std::getline(std::cin,line)) + while (std::getline(std::cin, line)) { args.push_back(line); + } } - if (args.size() < 1) + if (args.size() < 1) { throw std::runtime_error("too few parameters (need at least command)"); + } std::string strMethod = args[0]; args.erase(args.begin()); // Remove trailing method name from arguments vector |