i9e_attach_to_stdout(): Don't insist on btrn == NULL.

[paraslash.git] / interactive.c

diff --git a/interactive.c b/interactive.c
index 6a29bffae5a68e783d4a4d788239b24455c4cb1e..f2e4a355012ce1aa3861ba8b7bec56443a80df8e 100644 (file)
--- 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("");
@@ -298,11 +295,9 @@ 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();
+       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);