From 8ed782af8c51c4f79b81825f7a049b12baf93cb1 Mon Sep 17 00:00:00 2001
From: Andre <maan@p133.(none)>
Date: Thu, 13 Jul 2006 16:00:57 +0200
Subject: [PATCH] gui: fix command abort

Always kill the the child process if user aborts.
---
 gui.c | 41 +++++++++++++++++++++++++----------------
 1 file changed, 25 insertions(+), 16 deletions(-)

diff --git a/gui.c b/gui.c
index c0588197..2513db6d 100644
--- a/gui.c
+++ b/gui.c
@@ -56,8 +56,8 @@ void *bot_win_rb;
 
 static unsigned scroll_position;
 
-static int external_cmd_died, curses_active;
-static pid_t external_cmd_pid;
+static int cmd_died, curses_active;
+static pid_t cmd_pid;
 
 static int command_pipe = -1;
 static int audiod_pipe = -1;
@@ -735,9 +735,9 @@ reap_next_child:
 	pid = para_reap_child();
 	if (pid <= 0)
 		return;
-	if (pid == external_cmd_pid) {
-		external_cmd_pid = 0;
-		external_cmd_died = 1;
+	if (pid == cmd_pid) {
+		cmd_pid = 0;
+		cmd_died = 1;
 	}
 	goto reap_next_child;
 }
@@ -867,7 +867,7 @@ static int open_audiod_pipe(void)
  *
  * EXTERNAL_MODE: Check only signal pipe. Used when an external command
  * is running. During that thime curses is disabled.  Returns when
- * external_cmd_pid == 0.
+ * cmd_pid == 0.
  */
 static int do_select(int mode)
 {
@@ -936,6 +936,16 @@ check_return:
 		if (cp_numread <= 0)
 			cbo = 0;
 		wrefresh(bot.win);
+		ret = wgetch(top.win);
+		if (ret != ERR && ret != KEY_RESIZE) {
+			if (command_pipe) {
+				close(command_pipe);
+				command_pipe = -1;
+			}
+			if (cmd_pid)
+				kill(cmd_pid, SIGTERM);
+			return -1;
+		}
 		break;
 	case GETCH_MODE:
 		ret = wgetch(top.win);
@@ -943,8 +953,8 @@ check_return:
 			return ret;
 		break;
 	case EXTERNAL_MODE:
-		if (external_cmd_died) {
-			external_cmd_died = 0;
+		if (cmd_died) {
+			cmd_died = 0;
 			return 0;
 		}
 	}
@@ -968,13 +978,12 @@ static int send_output(void)
 
 static int client_cmd_cmdline(char *cmd)
 {
-	pid_t pid;
 	int ret, fds[3] = {0, 1, 0};
 	char *c = make_message(BINDIR "/para_client %s", cmd);
 
 	outputf(COLOR_COMMAND, "%s", c);
-	print_in_bar(COLOR_MSG, "executing client command, hit q to abort\n");
-	ret = para_exec_cmdline_pid(&pid, c, fds);
+	print_in_bar(COLOR_MSG, "executing client command, hit any key to abort\n");
+	ret = para_exec_cmdline_pid(&cmd_pid, c, fds);
 	free(c);
 	if (ret < 0)
 		return -1;
@@ -987,12 +996,11 @@ static int client_cmd_cmdline(char *cmd)
  */
 static int display_cmd(char *cmd)
 {
-	pid_t pid;
 	int fds[3] = {0, 1, 0};
 
-	print_in_bar(COLOR_MSG, "executing display command, hit q to abort");
+	print_in_bar(COLOR_MSG, "executing display command, hit any key to abort");
 	outputf(COLOR_COMMAND, "%s", cmd);
-	if (para_exec_cmdline_pid(&pid, cmd, fds) < 0)
+	if (para_exec_cmdline_pid(&cmd_pid, cmd, fds) < 0)
 		return -1;
 	command_pipe = fds[1];
 	return send_output();
@@ -1005,10 +1013,11 @@ static int external_cmd(char *cmd)
 {
 	int fds[3] = {-1, -1, -1};
 
-	if (external_cmd_pid)
+	if (cmd_pid)
 		return -1;
 	shutdown_curses();
-	para_exec_cmdline_pid(&external_cmd_pid, cmd, fds);
+	para_exec_cmdline_pid(&cmd_pid, cmd, fds);
+	cmd_died = 0;
 	do_select(EXTERNAL_MODE);
 	init_curses();
 	return 0;
-- 
2.39.5