1 files changed, 35 insertions, 4 deletions

diff --git a/shell/ash.c b/shell/ash.c
index 3919118f0..0038aa1e9 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -929,6 +929,7 @@ raise_interrupt(void)
                 raise(SIGINT);
 #else
                 fflush_all();
+                kill(-getpid(), SIGINT);
                 _exit(SIGINT << 24);
 #endif
         }
@@ -4274,7 +4275,7 @@ signal_handler(int signo)
                         return;
         }
 #if ENABLE_FEATURE_EDITING
-        bb_got_signal = signo; /* for read_line_input: "we got a signal" */
+        bb_got_signal = signo; /* for read_line_input / read builtin: "we got a signal" */
 #endif
         gotsig[signo - 1] = 1;
         pending_sig = signo;
@@ -15812,6 +15813,7 @@ readcmd(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
         r = shell_builtin_read(&params);
         INT_ON;
 
+#if !ENABLE_PLATFORM_MINGW32
         if ((uintptr_t)r == 1 && errno == EINTR) {
                 /* To get SIGCHLD: sleep 1 & read x; echo $x
                  * Correct behavior is to not exit "read"
@@ -15820,8 +15822,15 @@ readcmd(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
                         goto again;
         }
 
-#if ENABLE_PLATFORM_MINGW32
+        if ((uintptr_t)r == 2) /* -t SEC timeout? */
+                /* bash: "The exit status is greater than 128 if the timeout is exceeded." */
+                /* The actual value observed with bash 5.2.15: */
+                return 128 + SIGALRM;
+#else /* ENABLE_PLATFORM_MINGW32 */
         if ((uintptr_t)r == 2) {
+                /* Timeout, return 128 + SIGALRM */
+                return 142;
+        } else if ((uintptr_t)r == 3) {
                 /* ^C pressed, propagate event */
                 if (trap[SIGINT]) {
                         write(STDOUT_FILENO, "^C", 2);
@@ -15969,8 +15978,25 @@ exitshell(void)
         char *p;
 
 #if ENABLE_FEATURE_EDITING_SAVE_ON_EXIT
-        save_history(line_input_state); /* may be NULL */
+        if (line_input_state) {
+                const char *hp;
+# if ENABLE_FEATURE_SH_HISTFILESIZE
+// in bash:
+// HISTFILESIZE controls the on-disk history file size (in lines, 0=no history):
+// "When this variable is assigned a value, the history file is truncated, if necessary"
+// but we do it only at exit, not on assignment:
+                /* Use HISTFILESIZE to limit file size */
+                hp = lookupvar("HISTFILESIZE");
+                if (hp)
+                        line_input_state->max_history = size_from_HISTFILESIZE(hp);
+# endif
+                /* HISTFILE: "If unset, the command history is not saved when a shell exits." */
+                hp = lookupvar("HISTFILE");
+                line_input_state->hist_file = hp;
+                save_history(line_input_state); /* no-op if hist_file is NULL or "" */
+        }
 #endif
+
         savestatus = exitstatus;
         TRACE(("pid %d, exitshell(%d)\n", getpid(), savestatus));
         if (setjmp(loc.loc))
@@ -16474,7 +16500,12 @@ int ash_main(int argc UNUSED_PARAM, char **argv)
                         if (hp)
                                 line_input_state->hist_file = xstrdup(hp);
 # if ENABLE_FEATURE_SH_HISTFILESIZE
-                        hp = lookupvar("HISTFILESIZE");
+                        hp = lookupvar("HISTSIZE");
+                        /* Using HISTFILESIZE above to limit max_history would be WRONG:
+                         * users may set HISTFILESIZE=0 in their profile scripts
+                         * to prevent _saving_ of history files, but still want to have
+                         * non-zero history limit for in-memory list.
+                         */
                         line_input_state->max_history = size_from_HISTFILESIZE(hp);
 # endif
                 }