X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=gui.c;h=a34f27de5e40cb0adbb2d652d18586c955d88a90;hb=20e2c6a532dcb0c197062b9f97753e000eae3c6a;hp=9ac24ab6baddb74f8a991d770dedf609546bae09;hpb=d7562ba640e30ac4bf1160509f4c2f705363d53f;p=paraslash.git

diff --git a/gui.c b/gui.c
index 9ac24ab6..a34f27de 100644
--- a/gui.c
+++ b/gui.c
@@ -50,7 +50,7 @@ static struct ringbuffer *bot_win_rb;
 
 static unsigned scroll_position;
 
-static int cmd_died, curses_active;
+static int curses_active;
 static pid_t cmd_pid;
 
 static int command_fds[2];
@@ -533,7 +533,8 @@ static void setup_signal_handling(void)
 	para_sigaction(SIGHUP, SIG_IGN);
 }
 
-__noreturn static void do_exit(int ret)
+/* kill every process in the process group and exit */
+__noreturn static void kill_pg_and_die(int ret)
 {
 	para_sigaction(SIGTERM, SIG_IGN);
 	kill(0, SIGTERM);
@@ -552,7 +553,7 @@ static void shutdown_curses(void)
 __noreturn static void finish(int ret)
 {
 	shutdown_curses();
-	do_exit(ret);
+	kill_pg_and_die(ret);
 }
 
 /*
@@ -567,7 +568,7 @@ __noreturn __printf_2_3 static void msg_n_exit(int ret, const char* fmt, ...)
 	va_start(argp, fmt);
 	vfprintf(outfd, fmt, argp);
 	va_end(argp);
-	do_exit(ret);
+	kill_pg_and_die(ret);
 }
 
 static void print_welcome(void)
@@ -834,10 +835,8 @@ reap_next_child:
 	ret = para_reap_child(&pid);
 	if (ret <= 0)
 		return;
-	if (pid == cmd_pid) {
+	if (pid == cmd_pid)
 		cmd_pid = 0;
-		cmd_died = 1;
-	}
 	goto reap_next_child;
 }
 
@@ -1066,10 +1065,8 @@ check_return:
 			return ret;
 		break;
 	case EXTERNAL_MODE:
-		if (cmd_died) {
-			cmd_died = 0;
+		if (cmd_pid == 0)
 			return 0;
-		}
 	}
 	goto repeat;
 }
@@ -1143,7 +1140,6 @@ static void external_cmd(char *cmd)
 	shutdown_curses();
 	if (para_exec_cmdline_pid(&cmd_pid, cmd, fds) < 0)
 		return;
-	cmd_died = 0;
 	do_select(EXTERNAL_MODE);
 	init_curses();
 }