1 files changed, 25 insertions, 16 deletions

diff --git a/shell/hush.c b/shell/hush.c
index e4138adf7..7a34f59ae 100644
--- a/shell/hush.c
+++ b/shell/hush.c
@@ -1541,6 +1541,10 @@ static sighandler_t pick_sighandler(unsigned sig)
 static void hush_exit(int exitcode) NORETURN;
 static void hush_exit(int exitcode)
 {
+#if ENABLE_FEATURE_EDITING_SAVE_ON_EXIT
+        save_history(G.line_input_state);
+#endif
+
         fflush_all();
         if (G.exiting <= 0 && G.traps && G.traps[0] && G.traps[0][0]) {
                 char *argv[3];
@@ -7817,22 +7821,6 @@ int hush_main(int argc, char **argv)
 
 #if ENABLE_FEATURE_EDITING
         G.line_input_state = new_line_input_t(FOR_SHELL);
-# if defined MAX_HISTORY && MAX_HISTORY > 0 && ENABLE_HUSH_SAVEHISTORY
-        {
-                const char *hp = get_local_var_value("HISTFILE");
-                if (!hp) {
-                        hp = get_local_var_value("HOME");
-                        if (hp) {
-                                G.line_input_state->hist_file = concat_path_file(hp, ".hush_history");
-                                //set_local_var(xasprintf("HISTFILE=%s", ...));
-                        }
-                }
-# if ENABLE_FEATURE_SH_HISTFILESIZE
-                hp = get_local_var_value("HISTFILESIZE");
-                G.line_input_state->max_history = size_from_HISTFILESIZE(hp);
-# endif
-        }
-# endif
 #endif
 
         /* Initialize some more globals to non-zero values */
@@ -8104,6 +8092,27 @@ int hush_main(int argc, char **argv)
                 /* -1 is special - makes xfuncs longjmp, not exit
                  * (we reset die_sleep = 0 whereever we [v]fork) */
                 enable_restore_tty_pgrp_on_exit(); /* sets die_sleep = -1 */
+
+# if ENABLE_HUSH_SAVEHISTORY && MAX_HISTORY > 0
+                {
+                        const char *hp = get_local_var_value("HISTFILE");
+                        if (!hp) {
+                                hp = get_local_var_value("HOME");
+                                if (hp)
+                                        hp = concat_path_file(hp, ".hush_history");
+                        } else {
+                                hp = xstrdup(hp);
+                        }
+                        if (hp) {
+                                G.line_input_state->hist_file = hp;
+                                //set_local_var(xasprintf("HISTFILE=%s", ...));
+                        }
+#  if ENABLE_FEATURE_SH_HISTFILESIZE
+                        hp = get_local_var_value("HISTFILESIZE");
+                        G.line_input_state->max_history = size_from_HISTFILESIZE(hp);
+#  endif
+                }
+# endif
         } else {
                 install_special_sighandlers();
         }