From 5aeab5ab4075c7740c223678df1548dc4a402d83 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Sat, 21 Mar 2020 13:15:38 +0000
Subject: Preserve exit status from run-shell and pass to the client.

---
 cmd-run-shell.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'cmd-run-shell.c')

diff --git a/cmd-run-shell.c b/cmd-run-shell.c
index 1cf97d51..a57beb83 100644
--- a/cmd-run-shell.c
+++ b/cmd-run-shell.c
@@ -160,6 +160,7 @@ cmd_run_shell_callback(struct job *job)
 {
 	struct cmd_run_shell_data	*cdata = job_get_data(job);
 	struct bufferevent		*event = job_get_event(job);
+	struct cmdq_item		*item = cdata->item;
 	char				*cmd = cdata->cmd, *msg = NULL, *line;
 	size_t				 size;
 	int				 retcode, status;
@@ -189,13 +190,17 @@ cmd_run_shell_callback(struct job *job)
 	} else if (WIFSIGNALED(status)) {
 		retcode = WTERMSIG(status);
 		xasprintf(&msg, "'%s' terminated by signal %d", cmd, retcode);
+		retcode += 128;
 	}
 	if (msg != NULL)
 		cmd_run_shell_print(job, msg);
 	free(msg);
 
-	if (cdata->item != NULL)
-		cmdq_continue(cdata->item);
+	if (item != NULL) {
+		if (item->client != NULL && item->client->session == NULL)
+			item->client->retval = retcode;
+		cmdq_continue(item);
+	}
 }
 
 static void
-- 
cgit v1.2.3