interactive: Honor SIGTERM.

[paraslash.git] / interactive.c

diff --git a/interactive.c b/interactive.c
index a145b0dfc56268a8e90e1b011147b282756eab59..dda5f84e5184b398a10652bd45ddda941e3a703e 100644 (file)
--- a/interactive.c
+++ b/interactive.c
@@ -33,6 +33,7 @@ struct i9e_private {
        bool line_handler_running;
        bool input_eof;
        bool caught_sigint;
+       bool caught_sigterm;
 };
 static struct i9e_private i9e_private, *i9ep = &i9e_private;
 
@@ -178,11 +179,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,14 +199,9 @@ void i9e_close(void)
        char *hf = i9ep->ici->history_file;
 
        rl_deprep_terminal();
-       fprintf(i9ep->stderr_stream, "\n");
        if (hf)
                write_history(hf);
-}
-
-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)
@@ -271,16 +272,19 @@ static void i9e_post_select(struct sched *s, struct task *t)
        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);
@@ -297,7 +301,7 @@ static void i9e_post_select(struct sched *s, struct task *t)
 rm_btrn:
        btr_remove_node(&i9ep->stdout_btrn);
        rl_set_prompt(i9ep->ici->prompt);
-       rl_forced_update_display();
+       rl_redisplay();
 out:
        t->error = 0;
 }
@@ -306,7 +310,7 @@ static void i9e_pre_select(struct sched *s, __a_unused struct task *t)
 {
        int ret;
 
-       if (i9ep->input_eof || i9ep->caught_sigint) {
+       if (i9ep->input_eof || i9ep->caught_sigint || i9ep->caught_sigterm) {
                sched_min_delay(s);
                return;
        }
@@ -411,8 +415,7 @@ __printf_2_3 void i9e_log(int ll, const char* fmt,...)
 
        if (ll < i9ep->ici->loglevel)
                return;
-       if (!i9ep->stdout_btrn)
-               clear_bottom_line();
+       clear_bottom_line();
        va_start(argp, fmt);
        vfprintf(i9ep->stderr_stream, fmt, argp);
        va_end(argp);
@@ -434,6 +437,8 @@ void i9e_signal_dispatch(int sig_num)
                reset_line_state();
                i9ep->caught_sigint = true;
        }
+       if (sig_num == SIGTERM)
+               i9ep->caught_sigterm = true;
 }
 
 /**