From 5f8b77480cbf6a14606e56df4ff83c9e908ed0e6 Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Tue, 8 Aug 2023 06:58:10 +0930 Subject: [PATCH] plugins: fix error report from bitcoin-cli exec failure. We've stomped errno, so if exec fails we don't get a reliable result: ``` 2023-08-07T17:58:45.713Z **BROKEN** plugin-bcli: bitcoin-cli exec failed: Bad file descriptor ``` Signed-off-by: Rusty Russell --- plugins/bcli.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/plugins/bcli.c b/plugins/bcli.c index ce07b78a6..d7bd4fac8 100644 --- a/plugins/bcli.c +++ b/plugins/bcli.c @@ -298,16 +298,16 @@ static void next_bcli(enum bitcoind_prio prio) bcli->pid = pipecmdarr(&in, &bcli->fd, &bcli->fd, cast_const2(char **, bcli->args)); + if (bcli->pid < 0) + plugin_err(bcli->cmd->plugin, "%s exec failed: %s", + bcli->args[0], strerror(errno)); + if (bitcoind->rpcpass) write_all(in, bitcoind->rpcpass, strlen(bitcoind->rpcpass)); close(in); - if (bcli->pid < 0) - plugin_err(bcli->cmd->plugin, "%s exec failed: %s", - bcli->args[0], strerror(errno)); - bcli->start = time_now(); bitcoind->num_requests[prio]++;