X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=interactive.c;h=43cb99f2781979e74b66eef640fadb7878f30aeb;hp=ef6fc7620195188db8ccf491176142b29690a9ba;hb=1afc43be9a585ce634de84764f171e4478ec54be;hpb=f99dbea033c521a886b99405f5e9efc80e2c32e1 diff --git a/interactive.c b/interactive.c index ef6fc762..43cb99f2 100644 --- a/interactive.c +++ b/interactive.c @@ -272,6 +272,7 @@ static void clear_bottom_line(void) rl_redisplay(); wipe_bottom_line(); /* wipe out the prompt */ rl_insert_text(text); + free(text); rl_point = point; } @@ -290,21 +291,25 @@ static bool input_available(void) static void i9e_line_handler(char *line) { int ret; - struct btr_node *dummy = btr_new_node(&(struct btr_node_description) + struct btr_node *dummy; + + if (!line) { + i9ep->input_eof = true; + return; + } + if (!*line) + goto free_line; + rl_set_prompt(""); + dummy = btr_new_node(&(struct btr_node_description) EMBRACE(.name = "dummy line handler")); i9e_attach_to_stdout(dummy); - ret = i9ep->ici->line_handler(line); if (ret < 0) PARA_WARNING_LOG("%s\n", para_strerror(-ret)); - rl_set_prompt(""); - if (line) { - if (*line) - add_history(line); - free(line); - } else - i9ep->input_eof = true; + add_history(line); btr_remove_node(&dummy); +free_line: + free(line); } static int i9e_post_select(__a_unused struct sched *s, __a_unused struct task *t)