bool line_handler_running;
bool input_eof;
bool caught_sigint;
+ bool caught_sigterm;
};
static struct i9e_private i9e_private, *i9ep = &i9e_private;
*/
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.
*
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)
{
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("");
char *buf;
size_t sz;
- if (i9ep->input_eof) {
- t->error = -E_I9E_EOF;
- return;
- }
+ ret = -E_I9E_EOF;
+ if (i9ep->input_eof)
+ goto rm_btrn;
+ ret = -E_I9E_TERM_RQ;
+ if (i9ep->caught_sigterm)
+ goto rm_btrn;
if (!btrn) {
i9ep->caught_sigint = false;
if (FD_ISSET(ici->fds[0], &s->rfds))
i9e_input();
return;
}
+ ret = 0;
if (i9ep->caught_sigint)
goto rm_btrn;
ret = btr_node_status(i9ep->stdout_btrn, 0, BTR_NT_LEAF);
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;
}
{
int ret;
- if (i9ep->input_eof || i9ep->caught_sigint) {
+ if (i9ep->input_eof || i9ep->caught_sigint || i9ep->caught_sigterm) {
sched_min_delay(s);
return;
}
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)
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);
static void reset_line_state(void)
{
- if (i9ep->line_handler_running)
+ if (i9ep->stdout_btrn)
return;
rl_on_new_line();
rl_reset_line_state();
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);
reset_line_state();
i9ep->caught_sigint = true;
}
+ if (sig_num == SIGTERM)
+ i9ep->caught_sigterm = true;
}
/**
* 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)