X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=interactive.c;h=f2e4a355012ce1aa3861ba8b7bec56443a80df8e;hp=e17a7a106b7e6c813455251082cb59d650d36d1b;hb=b56199aab3056d397697ac0c510d4e973c240d7d;hpb=e5fbc490c2c16ecfa7bce58a18e11a0f7d382b91

diff --git a/interactive.c b/interactive.c
index e17a7a10..f2e4a355 100644
--- a/interactive.c
+++ b/interactive.c
@@ -178,11 +178,16 @@ static char **i9e_completer(const char *text, int start, __a_unused int end)
  */
 void i9e_attach_to_stdout(struct btr_node *producer)
 {
-	assert(!i9ep->stdout_btrn);
+	btr_remove_node(&i9ep->stdout_btrn);
 	i9ep->stdout_btrn = btr_new_node(&(struct btr_node_description)
 		EMBRACE(.name = "interactive_stdout", .parent = producer));
 }
 
+static void wipe_bottom_line(void)
+{
+	fprintf(i9ep->stderr_stream, "\r%s\r", i9ep->empty_line);
+}
+
 /**
  * Reset the terminal and save the in-memory command line history.
  *
@@ -193,15 +198,9 @@ void i9e_close(void)
 	char *hf = i9ep->ici->history_file;
 
 	rl_deprep_terminal();
-	fprintf(i9ep->stderr_stream, "\n");
 	if (hf)
 		write_history(hf);
-	fclose(i9ep->stderr_stream);
-}
-
-static void wipe_bottom_line(void)
-{
-	fprintf(i9ep->stderr_stream, "\r%s\r", i9ep->empty_line);
+	wipe_bottom_line();
 }
 
 static void clear_bottom_line(void)
@@ -241,9 +240,7 @@ static void i9e_line_handler(char *line)
 {
 	int ret;
 
-	i9ep->line_handler_running = true;
 	ret = i9ep->ici->line_handler(line);
-	i9ep->line_handler_running = false;
 	if (ret < 0)
 		PARA_WARNING_LOG("%s\n", para_strerror(-ret));
 	rl_set_prompt("");
@@ -292,17 +289,15 @@ static void i9e_post_select(struct sched *s, struct task *t)
 	sz = btr_next_buffer(btrn, &buf);
 	if (sz == 0)
 		goto out;
-	ret = write_nonblock(ici->fds[1], buf, sz);
+	ret = xwrite(ici->fds[1], buf, sz);
 	if (ret < 0)
 		goto rm_btrn;
 	btr_consume(btrn, ret);
 	goto out;
 rm_btrn:
-	btr_remove_node(btrn);
-	btr_free_node(btrn);
-	i9ep->stdout_btrn = NULL;
+	btr_remove_node(&i9ep->stdout_btrn);
 	rl_set_prompt(i9ep->ici->prompt);
-	rl_forced_update_display();
+	rl_redisplay();
 out:
 	t->error = 0;
 }
@@ -334,7 +329,6 @@ static void i9e_pre_select(struct sched *s, __a_unused struct task *t)
 		PARA_WARNING_LOG("set to nonblock failed: (fd0 %d, %s)\n",
 			i9ep->ici->fds[0], para_strerror(-ret));
 	para_fd_set(i9ep->ici->fds[0], &s->rfds, &s->max_fileno);
-	return;
 }
 
 static void update_winsize(void)
@@ -376,12 +370,14 @@ int i9e_open(struct i9e_client_info *ici, struct sched *s)
 		return ret;
 	i9ep->task.pre_select = i9e_pre_select;
 	i9ep->task.post_select = i9e_post_select;
+	sprintf(i9ep->task.status, "i9e");
 	register_task(s, &i9ep->task);
 	rl_readline_name = "para_i9e";
 	rl_basic_word_break_characters = " ";
 	rl_attempted_completion_function = i9e_completer;
 	i9ep->ici = ici;
 	i9ep->stderr_stream = fdopen(ici->fds[2], "w");
+	setvbuf(i9ep->stderr_stream, NULL, _IONBF, 0);
 
 	if (ici->history_file)
 		read_history(ici->history_file);
@@ -392,7 +388,7 @@ int i9e_open(struct i9e_client_info *ici, struct sched *s)
 
 static void reset_line_state(void)
 {
-	if (i9ep->line_handler_running)
+	if (i9ep->stdout_btrn)
 		return;
 	rl_on_new_line();
 	rl_reset_line_state();
@@ -415,8 +411,7 @@ __printf_2_3 void i9e_log(int ll, const char* fmt,...)
 
 	if (ll < i9ep->ici->loglevel)
 		return;
-	if (i9ep->line_handler_running == false)
-		clear_bottom_line();
+	clear_bottom_line();
 	va_start(argp, fmt);
 	vfprintf(i9ep->stderr_stream, fmt, argp);
 	va_end(argp);