X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=interactive.c;h=a145b0dfc56268a8e90e1b011147b282756eab59;hp=f9ea3612ee8a1b0e80bef508051ed737b9a0ba05;hb=b654beb95ef600a3b1bed5b5a5e079bb17d02c8a;hpb=c059f39305eb3629e06a89aa44816e98d29d78a8

diff --git a/interactive.c b/interactive.c
index f9ea3612..a145b0df 100644
--- a/interactive.c
+++ b/interactive.c
@@ -196,7 +196,6 @@ void i9e_close(void)
 	fprintf(i9ep->stderr_stream, "\n");
 	if (hf)
 		write_history(hf);
-	fclose(i9ep->stderr_stream);
 }
 
 static void wipe_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("");
@@ -298,9 +295,7 @@ static void i9e_post_select(struct sched *s, struct task *t)
 	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();
 out:
@@ -393,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();
@@ -416,7 +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)
+	if (!i9ep->stdout_btrn)
 		clear_bottom_line();
 	va_start(argp, fmt);
 	vfprintf(i9ep->stderr_stream, fmt, argp);