Merge busybox into merge

Fix conflicts in reset and ash.

Redefine the new safe_read_key() as a reference to read_key().

Disable SHA256_HWACCEL.

3 files changed, 90 insertions, 38 deletions

diff --git a/shell/ash.c b/shell/ash.c
index a1d01447a..46c4f1675 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -428,7 +428,7 @@ static void forkshell_print(FILE *fp0, struct forkshell *fs, const char **notes)
 /* ============ Shell options */
 
 /* If you add/change options hare, update --help text too */
-static const char *const optletters_optnames[] = {
+static const char *const optletters_optnames[] ALIGN_PTR = {
         "e"   "errexit",
         "f"   "noglob",
 /* bash has '-o ignoreeof', but no short synonym -I for it */
@@ -845,7 +845,7 @@ raise_exception(int e)
 /*
  * Called when a SIGINT is received.  (If the user specifies
  * that SIGINT is to be trapped or ignored using the trap builtin, then
- * this routine is not called.)  Suppressint is nonzero when interrupts
+ * this routine is not called.)  suppress_int is nonzero when interrupts
  * are held using the INT_OFF macro.  (The test for iflag is just
  * defensive programming.)
  */
@@ -882,13 +882,12 @@ raise_interrupt(void)
 } while (0)
 #endif
 
-static IF_ASH_OPTIMIZE_FOR_SIZE(inline) void
+static IF_NOT_ASH_OPTIMIZE_FOR_SIZE(inline) void
 int_on(void)
 {
         barrier();
-        if (--suppress_int == 0 && pending_int) {
+        if (--suppress_int == 0 && pending_int)
                 raise_interrupt();
-        }
 }
 #if DEBUG_INTONOFF
 # define INT_ON do { \
@@ -898,7 +897,7 @@ int_on(void)
 #else
 # define INT_ON int_on()
 #endif
-static IF_ASH_OPTIMIZE_FOR_SIZE(inline) void
+static IF_NOT_ASH_OPTIMIZE_FOR_SIZE(inline) void
 force_int_on(void)
 {
         barrier();
@@ -4143,7 +4142,9 @@ signal_handler(int signo)
                 if (!trap[SIGCHLD])
                         return;
         }
-
+#if ENABLE_FEATURE_EDITING
+        bb_got_signal = signo; /* for read_line_input: "we got a signal" */
+#endif
         gotsig[signo - 1] = 1;
         pending_sig = signo;
 
@@ -11656,33 +11657,56 @@ preadfd(void)
 # endif
                 reinit_unicode_for_ash();
  again:
+                /* For shell, LI_INTERRUPTIBLE is set:
+                 * read_line_input will abort on either
+                 * getting EINTR in poll(), or if it sees bb_got_signal != 0
+                 * (IOW: if signal arrives before poll() is reached).
+                 * Interactive testcases:
+                 * (while kill -INT $$; do sleep 1; done) &
+                 * #^^^ prints ^C, prints prompt, repeats
+                 * trap 'echo I' int; (while kill -INT $$; do sleep 1; done) &
+                 * #^^^ prints ^C, prints "I", prints prompt, repeats
+                 * trap 'echo T' term; (while kill $$; do sleep 1; done) &
+                 * #^^^ prints "T", prints prompt, repeats
+                 * #(bash 5.0.17 exits after first "T", looks like a bug)
+                 */
+                bb_got_signal = 0;
+                INT_OFF; /* no longjmp'ing out of read_line_input please */
                 nr = read_line_input(line_input_state, cmdedit_prompt, buf, IBUFSIZ);
+                if (bb_got_signal == SIGINT)
+                        write(STDOUT_FILENO, "^C\n", 3);
+                INT_ON; /* here non-blocked SIGINT will longjmp */
                 if (nr == 0) {
                         /* ^C pressed, "convert" to SIGINT */
 # if !ENABLE_PLATFORM_MINGW32
-                        write(STDOUT_FILENO, "^C", 2);
-                        raise(SIGINT);
+                        write(STDOUT_FILENO, "^C\n", 3);
+                        raise(SIGINT); /* here non-blocked SIGINT will longjmp */
                         /* raise(SIGINT) did not work! (e.g. if SIGINT
-                         * is SIG_INGed on startup, it stays SIG_IGNed)
+                         * is SIG_IGNed on startup, it stays SIG_IGNed)
                          */
 # else
                         raise_interrupt();
 # endif
                         if (trap[SIGINT]) {
+ empty_line_input:
                                 buf[0] = '\n';
                                 buf[1] = '\0';
                                 return 1;
                         }
                         exitstatus = 128 + SIGINT;
                         /* bash behavior on ^C + ignored SIGINT: */
-                        write(STDOUT_FILENO, "\n", 1);
                         goto again;
                 }
                 if (nr < 0) {
                         if (errno == 0) {
-                                /* Ctrl+D pressed */
+                                /* ^D pressed */
                                 nr = 0;
                         }
+                        else if (errno == EINTR) { /* got signal? */
+                                if (bb_got_signal != SIGINT)
+                                        write(STDOUT_FILENO, "\n", 1);
+                                goto empty_line_input;
+                        }
 # if ENABLE_ASH_IDLE_TIMEOUT
                         else if (errno == EAGAIN && timeout > 0) {
                                 puts("\007timed out waiting for input: auto-logout");
diff --git a/shell/hush.c b/shell/hush.c
index 982fc356a..ae81f0da5 100644
--- a/shell/hush.c
+++ b/shell/hush.c
@@ -564,7 +564,7 @@ enum {
 #define NULL_O_STRING { NULL }
 
 #ifndef debug_printf_parse
-static const char *const assignment_flag[] = {
+static const char *const assignment_flag[] ALIGN_PTR = {
         "MAYBE_ASSIGNMENT",
         "DEFINITELY_ASSIGNMENT",
         "NOT_ASSIGNMENT",
@@ -918,6 +918,7 @@ struct globals {
 #if ENABLE_HUSH_INTERACTIVE
         smallint promptmode; /* 0: PS1, 1: PS2 */
 #endif
+        /* set by signal handler if SIGINT is received _and_ its trap is not set */
         smallint flag_SIGINT;
 #if ENABLE_HUSH_LOOPS
         smallint flag_break_continue;
@@ -1944,6 +1945,9 @@ enum {
 static void record_pending_signo(int sig)
 {
         sigaddset(&G.pending_set, sig);
+#if ENABLE_FEATURE_EDITING
+        bb_got_signal = sig; /* for read_line_input: "we got a signal" */
+#endif
 #if ENABLE_HUSH_FAST
         if (sig == SIGCHLD) {
                 G.count_SIGCHLD++;
@@ -2652,30 +2656,53 @@ static int get_user_input(struct in_str *i)
         for (;;) {
                 reinit_unicode_for_hush();
                 G.flag_SIGINT = 0;
-                /* buglet: SIGINT will not make new prompt to appear _at once_,
-                 * only after <Enter>. (^C works immediately) */
-                r = read_line_input(G.line_input_state, prompt_str,
+
+                bb_got_signal = 0;
+                if (!sigisemptyset(&G.pending_set)) {
+                        /* Whoops, already got a signal, do not call read_line_input */
+                        bb_got_signal = r = -1;
+                } else {
+                        /* For shell, LI_INTERRUPTIBLE is set:
+                         * read_line_input will abort on either
+                         * getting EINTR in poll(), or if it sees bb_got_signal != 0
+                         * (IOW: if signal arrives before poll() is reached).
+                         * Interactive testcases:
+                         * (while kill -INT $$; do sleep 1; done) &
+                         * #^^^ prints ^C, prints prompt, repeats
+                         * trap 'echo I' int; (while kill -INT $$; do sleep 1; done) &
+                         * #^^^ prints ^C, prints "I", prints prompt, repeats
+                         * trap 'echo T' term; (while kill $$; do sleep 1; done) &
+                         * #^^^ prints "T", prints prompt, repeats
+                         * #(bash 5.0.17 exits after first "T", looks like a bug)
+                         */
+                        r = read_line_input(G.line_input_state, prompt_str,
                                 G.user_input_buf, CONFIG_FEATURE_EDITING_MAX_LEN-1
-                );
-                /* read_line_input intercepts ^C, "convert" it to SIGINT */
-                if (r == 0) {
-                        raise(SIGINT);
+                        );
+                        /* read_line_input intercepts ^C, "convert" it to SIGINT */
+                        if (r == 0)
+                                raise(SIGINT);
+                }
+                /* bash prints ^C (before running a trap, if any)
+                 * both on keyboard ^C and on real SIGINT (non-kbd generated).
+                 */
+                if (sigismember(&G.pending_set, SIGINT)) {
+                        write(STDOUT_FILENO, "^C\n", 3);
+                        G.last_exitcode = 128 | SIGINT;
                 }
                 check_and_run_traps();
-                if (r != 0 && !G.flag_SIGINT)
+                if (r == 0) /* keyboard ^C? */
+                        continue; /* go back, read another input line */
+                if (r > 0) /* normal input? (no ^C, no ^D, no signals) */
                         break;
-                /* ^C or SIGINT: repeat */
-                /* bash prints ^C even on real SIGINT (non-kbd generated) */
-                write(STDOUT_FILENO, "^C\n", 3);
-                G.last_exitcode = 128 | SIGINT;
-        }
-        if (r < 0) {
-                /* EOF/error detected */
-                /* ^D on interactive input goes to next line before exiting: */
-                write(STDOUT_FILENO, "\n", 1);
-                i->p = NULL;
-                i->peek_buf[0] = r = EOF;
-                return r;
+                if (!bb_got_signal) {
+                        /* r < 0: ^D/EOF/error detected (but not signal) */
+                        /* ^D on interactive input goes to next line before exiting: */
+                        write(STDOUT_FILENO, "\n", 1);
+                        i->p = NULL;
+                        i->peek_buf[0] = r = EOF;
+                        return r;
+                }
+                /* it was a signal: go back, read another input line */
         }
         i->p = G.user_input_buf;
         return (unsigned char)*i->p++;
@@ -3655,7 +3682,7 @@ static void free_pipe_list(struct pipe *pi)
 #ifndef debug_print_tree
 static void debug_print_tree(struct pipe *pi, int lvl)
 {
-        static const char *const PIPE[] = {
+        static const char *const PIPE[] ALIGN_PTR = {
                 [PIPE_SEQ] = "SEQ",
                 [PIPE_AND] = "AND",
                 [PIPE_OR ] = "OR" ,
@@ -3690,7 +3717,7 @@ static void debug_print_tree(struct pipe *pi, int lvl)
                 [RES_XXXX ] = "XXXX" ,
                 [RES_SNTX ] = "SNTX" ,
         };
-        static const char *const CMDTYPE[] = {
+        static const char *const CMDTYPE[] ALIGN_PTR = {
                 "{}",
                 "()",
                 "[noglob]",
@@ -7632,7 +7659,7 @@ static int generate_stream_from_string(const char *s, pid_t *pid_p)
                 if (is_prefixed_with(s, "trap")
                  && skip_whitespace(s + 4)[0] == '\0'
                 ) {
-                        static const char *const argv[] = { NULL, NULL };
+                        static const char *const argv[] ALIGN_PTR = { NULL, NULL };
                         builtin_trap((char**)argv);
                         fflush_all(); /* important */
                         _exit(0);
@@ -9799,7 +9826,7 @@ static int run_list(struct pipe *pi)
                                 static const char encoded_dollar_at[] ALIGN1 = {
                                         SPECIAL_VAR_SYMBOL, '@' | 0x80, SPECIAL_VAR_SYMBOL, '\0'
                                 }; /* encoded representation of "$@" */
-                                static const char *const encoded_dollar_at_argv[] = {
+                                static const char *const encoded_dollar_at_argv[] ALIGN_PTR = {
                                         encoded_dollar_at, NULL
                                 }; /* argv list with one element: "$@" */
                                 char **vals;
@@ -10361,7 +10388,7 @@ int hush_main(int argc, char **argv)
 //it ignores TERM:
 //      bash -i -c 'kill $$; echo ALIVE'
 //      ALIVE
-//it resets SIG_INGed HUP to SIG_DFL:
+//it resets SIG_IGNed HUP to SIG_DFL:
 //      trap '' hup; bash -i -c 'kill -hup $$; echo ALIVE'
 //      Hangup   [the message is not printed by bash, it's the shell which started it]
 //is talkative about jobs and exiting:
diff --git a/shell/shell_common.c b/shell/shell_common.c
index fff356c04..399d5e684 100644
--- a/shell/shell_common.c
+++ b/shell/shell_common.c
@@ -218,6 +218,7 @@ shell_builtin_read(struct builtin_read_params *params)
                  */
                 errno = 0;
                 pfd[0].events = POLLIN;
+//TODO race with a signal arriving just before the poll!
                 if (poll(pfd, 1, timeout) <= 0) {
                         /* timed out, or EINTR */
                         err = errno;