Merge commit '1_19_4' into merge_1_19

2 files changed, 16 insertions, 10 deletions

diff --git a/shell/cttyhack.c b/shell/cttyhack.c
index 4261289b4..37ea13723 100644
--- a/shell/cttyhack.c
+++ b/shell/cttyhack.c
@@ -122,10 +122,12 @@ int cttyhack_main(int argc UNUSED_PARAM, char **argv)
                 do {
 #ifdef __linux__
                         int s = open_read_close("/sys/class/tty/console/active",
-                                console + 5, sizeof(console) - 5 - 1);
+                                console + 5, sizeof(console) - 5);
                         if (s > 0) {
-                                /* found active console via sysfs (Linux 2.6.38+) */
-                                console[5 + s] = '\0';
+                                /* found active console via sysfs (Linux 2.6.38+)
+                                 * sysfs string looks like "ttyS0\n" so zap the newline:
+                                 */
+                                console[4 + s] = '\0';
                                 break;
                         }
 
diff --git a/shell/hush.c b/shell/hush.c
index e4138adf7..de0af9cec 100644
--- a/shell/hush.c
+++ b/shell/hush.c
@@ -7817,20 +7817,24 @@ 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
+# if 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 (hp)
+                                hp = concat_path_file(hp, ".hush_history");
+                } else {
+                        hp = xstrdup(hp);
                 }
-# if ENABLE_FEATURE_SH_HISTFILESIZE
+                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
         }
 # endif
 #endif