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

diff --git a/interactive.c b/interactive.c
index 64ee9202..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("");
@@ -292,15 +289,13 @@ 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();
 out:
@@ -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,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);
@@ -481,7 +477,7 @@ int i9e_select(int n, fd_set *readfds, fd_set *writefds,
  * This function is independent of readline and may be called before
  * i9e_open().
  *
- * return The number of possible completions.
+ * \return The number of possible completions.
  */
 int i9e_extract_completions(const char *word, char **string_list,
 		char ***result)