add newline after -stdin*

kallewoof · kallewoof · commit 50c4afa3c420 · 2019-10-01T12:19:31.000+09:00
diff --git a/src/bitcoin-cli.cpp b/src/bitcoin-cli.cpp
@@ -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;

Original file line number	Diff line number	Diff line change
`@@ -421,6 +421,9 @@ static int CommandLineRPC(int argc, char *argv[])`
`421`	`421`	`if (!std::getline(std::cin, rpcPass)) {`
`422`	`422`	`throw std::runtime_error("-stdinrpcpass specified but failed to read from standard input");`
`423`	`423`	`}`
	`424`	`+ if (StdinTerminal()) {`
	`425`	`+ fputc('\n', stdout);`
	`426`	`+ }`
`424`	`427`	`gArgs.ForceSetArg("-rpcpassword", rpcPass);`
`425`	`428`	`}`
`426`	`429`	`std::vector<std::string> args = std::vector<std::string>(&argv[1], &argv[argc]);`
`@@ -437,6 +440,9 @@ static int CommandLineRPC(int argc, char *argv[])`
`437`	`440`	`if (!std::getline(std::cin, walletPass)) {`
`438`	`441`	`throw std::runtime_error("-stdinwalletpassphrase specified but failed to read from standard input");`
`439`	`442`	`}`
	`443`	`+ if (StdinTerminal()) {`
	`444`	`+ fputc('\n', stdout);`
	`445`	`+ }`
`440`	`446`	`args.insert(args.begin() + 1, walletPass);`
`441`	`447`	`}`
`442`	`448`	`if (gArgs.GetBoolArg("-stdin", false)) {`
`@@ -445,6 +451,9 @@ static int CommandLineRPC(int argc, char *argv[])`
`445`	`451`	`while (std::getline(std::cin, line)) {`
`446`	`452`	`args.push_back(line);`
`447`	`453`	`}`
	`454`	`+ if (StdinTerminal()) {`
	`455`	`+ fputc('\n', stdout);`
	`456`	`+ }`
`448`	`457`	`}`
`449`	`458`	`std::unique_ptr<BaseRequestHandler> rh;`
`450`	`459`	`std::string method;`