1 files changed, 36 insertions, 18 deletions

diff --git a/shell/ash.c b/shell/ash.c
index 3919118f0..605215e41 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -461,7 +461,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 */
+/* If you add/change options here, update --help text too */
 static const char *const optletters_optnames[] ALIGN_PTR = {
         "e"   "errexit",
         "f"   "noglob",
@@ -929,6 +929,7 @@ raise_interrupt(void)
                 raise(SIGINT);
 #else
                 fflush_all();
+                kill(-getpid(), SIGINT);
                 _exit(SIGINT << 24);
 #endif
         }
@@ -1821,7 +1822,6 @@ struct stackmark {
         size_t stacknleft;
 };
 
-
 struct globals_memstack {
         struct stack_block *g_stackp; // = &stackbase;
         char *g_stacknxt; // = stackbase.space;
@@ -1844,7 +1844,6 @@ extern struct globals_memstack *BB_GLOBAL_CONST ash_ptr_to_globals_memstack;
         sstrend = stackbase.space + MINSIZE; \
 } while (0)
 
-
 #define stackblock()     ((void *)g_stacknxt)
 #define stackblocksize() g_stacknleft
 
@@ -2361,7 +2360,6 @@ struct localvar {
 # define VIMPORT        0x400   /* variable was imported from environment */
 #endif
 
-
 /* Need to be before varinit_data[] */
 #if ENABLE_LOCALE_SUPPORT
 static void FAST_FUNC
@@ -3581,7 +3579,6 @@ pwdcmd(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
 
 /* ============ ... */
 
-
 #define IBUFSIZ (ENABLE_FEATURE_EDITING ? CONFIG_FEATURE_EDITING_MAX_LEN : 1024)
 
 /* Syntax classes */
@@ -3988,13 +3985,11 @@ struct alias {
         int flag;
 };
 
-
 static struct alias **atab; // [ATABSIZE];
 #define INIT_G_alias() do { \
         atab = xzalloc(ATABSIZE * sizeof(atab[0])); \
 } while (0)
 
-
 static struct alias **
 __lookupalias(const char *name)
 {
@@ -4176,7 +4171,6 @@ unaliascmd(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
 
 #endif /* ASH_ALIAS */
 
-
 /* Mode argument to forkshell.  Don't change FORK_FG or FORK_BG. */
 #define FORK_FG    0
 #define FORK_BG    1
@@ -4274,7 +4268,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;
@@ -6193,7 +6187,6 @@ stoppedjobs(void)
 }
 #endif
 
-
 /*
  * Code for dealing with input/output redirection.
  */
@@ -9903,7 +9896,6 @@ commandcmd(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
 }
 #endif
 
-
 /*static int funcblocksize;     // size of structures in function */
 /*static int funcstringsize;    // size of strings in node */
 static void *funcblock;         /* block to allocate function from */
@@ -11919,7 +11911,6 @@ goodname(const char *p)
         return endofname(p)[0] == '\0';
 }
 
-
 /*
  * Search for a command.  This is called before we fork so that the
  * location of the command will be available in the parent as well as
@@ -14772,7 +14763,6 @@ parseheredoc(void)
         }
 }
 
-
 static const char *
 expandstr(const char *ps, int syntax_type)
 {
@@ -15402,7 +15392,6 @@ find_command(char *name, struct cmdentry *entry, int act, const char *path)
         entry->u = cmdp->param;
 }
 
-
 /*
  * The trap builtin.
  */
@@ -15812,6 +15801,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 +15810,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 +15966,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))
@@ -16144,7 +16158,6 @@ init(void)
         }
 }
 
-
 //usage:#define ash_trivial_usage
 //usage:        "[-il] [-|+Cabefmnuvx] [-|+o OPT]... [-c 'SCRIPT' [ARG0 ARGS] | FILE ARGS | -s ARGS]"
 ////////        comes from ^^^^^^^^^^optletters
@@ -16474,7 +16487,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
                 }