X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;ds=sidebyside;f=gui.c;h=6e44b09d37cc574846f1de0a4d325e586c69dad0;hb=e90c6c0a4d28a3f39e671c74ffe7c3de64650aa7;hp=728fb9b72c815237ca5aa51c9d590afa312e0464;hpb=a44fa6f118540d47cc575cbc62d22a6e4bb784e9;p=paraslash.git

diff --git a/gui.c b/gui.c
index 728fb9b7..6e44b09d 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];
@@ -287,14 +287,20 @@ static char *configfile_exists(void)
 	return file_exists(tmp)? tmp: NULL;
 }
 
-/*
- * print num spaces to curses window
- */
+/* Print given number of spaces to curses window. */
 static void add_spaces(WINDOW* win, unsigned int num)
 {
-	while (num > 0) {
-		num--;
-		waddstr(win, " ");
+	char space[] = "                                ";
+	unsigned sz = sizeof(space);
+
+	while (num >= sz)  {
+		waddstr(win, space);
+		num -= sz;
+	}
+	if (num > 0) {
+		assert(num < sz);
+		space[num] = '\0';
+		waddstr(win, space);
 	}
 }
 
@@ -533,7 +539,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 +559,7 @@ static void shutdown_curses(void)
 __noreturn static void finish(int ret)
 {
 	shutdown_curses();
-	do_exit(ret);
+	kill_pg_and_die(ret);
 }
 
 /*
@@ -567,7 +574,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 +841,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;
 }
 
@@ -993,6 +998,8 @@ repeat:
 		if (command_fds[1] >= 0)
 			para_fd_set(command_fds[1], &rfds, &max_fileno);
 	}
+	if (mode == GETCH_MODE || mode == COMMAND_MODE)
+		para_fd_set(STDIN_FILENO, &rfds, &max_fileno);
 	ret = para_select(max_fileno + 1, &rfds, NULL, &tv);
 	if (ret <= 0)
 		goto check_return; /* skip fd checks */
@@ -1064,10 +1071,8 @@ check_return:
 			return ret;
 		break;
 	case EXTERNAL_MODE:
-		if (cmd_died) {
-			cmd_died = 0;
+		if (cmd_pid == 0)
 			return 0;
-		}
 	}
 	goto repeat;
 }
@@ -1141,7 +1146,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();
 }