Merge branch 'busybox' into merge

5 files changed, 57 insertions, 14 deletions

diff --git a/shell/ash.c b/shell/ash.c
index 8f59dccda..6e6fc6a71 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -9501,6 +9501,9 @@ static int getoptscmd(int, char **) FAST_FUNC;
 #if !ENABLE_FEATURE_SH_EXTRA_QUIET
 static int helpcmd(int, char **) FAST_FUNC;
 #endif
+#if MAX_HISTORY
+static int historycmd(int, char **) FAST_FUNC;
+#endif
 #if ENABLE_SH_MATH_SUPPORT
 static int letcmd(int, char **) FAST_FUNC;
 #endif
@@ -9574,6 +9577,9 @@ static const struct builtincmd builtintab[] = {
 #if !ENABLE_FEATURE_SH_EXTRA_QUIET
         { BUILTIN_NOSPEC        "help"    , helpcmd    },
 #endif
+#if MAX_HISTORY
+        { BUILTIN_NOSPEC        "history" , historycmd },
+#endif
 #if JOBS
         { BUILTIN_REGULAR       "jobs"    , jobscmd    },
         { BUILTIN_REGULAR       "kill"    , killcmd    },
@@ -10155,7 +10161,12 @@ preadfd(void)
                  * _during_ shell execution, not only if it was set when
                  * shell was started. Therefore, re-check LANG every time:
                  */
-                reinit_unicode(lookupvar("LANG"));
+                {
+                        const char *s = lookupvar("LC_ALL");
+                        if (!s) s = lookupvar("LC_CTYPE");
+                        if (!s) s = lookupvar("LANG");
+                        reinit_unicode(s);
+                }
                 nr = read_line_input(line_input_state, cmdedit_prompt, buf, IBUFSIZ, timeout);
                 if (nr == 0) {
                         /* Ctrl+C pressed */
@@ -13163,6 +13174,15 @@ helpcmd(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
 }
 #endif /* FEATURE_SH_EXTRA_QUIET */
 
+#if MAX_HISTORY
+static int FAST_FUNC
+historycmd(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
+{
+        show_history(line_input_state);
+        return EXIT_SUCCESS;
+}
+#endif
+
 /*
  * The export and readonly commands.
  */
diff --git a/shell/hush.c b/shell/hush.c
index b23325725..912ecf15f 100644
--- a/shell/hush.c
+++ b/shell/hush.c
@@ -850,6 +850,9 @@ static int builtin_jobs(char **argv) FAST_FUNC;
 #if ENABLE_HUSH_HELP
 static int builtin_help(char **argv) FAST_FUNC;
 #endif
+#if MAX_HISTORY && ENABLE_FEATURE_EDITING
+static int builtin_history(char **argv) FAST_FUNC;
+#endif
 #if ENABLE_HUSH_LOCAL
 static int builtin_local(char **argv) FAST_FUNC;
 #endif
@@ -919,6 +922,9 @@ static const struct built_in_command bltins1[] = {
 #if ENABLE_HUSH_HELP
         BLTIN("help"     , builtin_help    , NULL),
 #endif
+#if MAX_HISTORY && ENABLE_FEATURE_EDITING
+        BLTIN("history"  , builtin_history , "Show command history"),
+#endif
 #if ENABLE_HUSH_JOB
         BLTIN("jobs"     , builtin_jobs    , "List jobs"),
 #endif
@@ -1383,7 +1389,7 @@ static void restore_G_args(save_arg_t *sv, char **argv)
  * are set to '' (ignore) are NOT reset to defaults. We do the same.
  *
  * Problem: the above approach makes it unwieldy to catch signals while
- * we are in read builtin, of while we read commands from stdin:
+ * we are in read builtin, or while we read commands from stdin:
  * masked signals are not visible!
  *
  * New implementation
@@ -2038,7 +2044,10 @@ static void get_user_input(struct in_str *i)
                  * _during_ shell execution, not only if it was set when
                  * shell was started. Therefore, re-check LANG every time:
                  */
-                reinit_unicode(get_local_var_value("LANG"));
+                const char *s = get_local_var_value("LC_ALL");
+                if (!s) s = get_local_var_value("LC_CTYPE");
+                if (!s) s = get_local_var_value("LANG");
+                reinit_unicode(s);
 
                 G.flag_SIGINT = 0;
                 /* buglet: SIGINT will not make new prompt to appear _at once_,
@@ -7354,7 +7363,7 @@ static int run_list(struct pipe *pi)
                                  * and we should not execute CMD */
                                 debug_printf_exec("skipped cmd because of || or &&\n");
                                 last_followup = pi->followup;
-                                continue;
+                                goto dont_check_jobs_but_continue;
                         }
                 }
                 last_followup = pi->followup;
@@ -7493,8 +7502,10 @@ static int run_list(struct pipe *pi)
                                                         G.flag_break_continue = 0;
                                                 /* else: e.g. "continue 2" should *break* once, *then* continue */
                                         } /* else: "while... do... { we are here (innermost list is not a loop!) };...done" */
-                                        if (G.depth_break_continue != 0 || fbc == BC_BREAK)
-                                                goto check_jobs_and_break;
+                                        if (G.depth_break_continue != 0 || fbc == BC_BREAK) {
+                                                checkjobs(NULL);
+                                                break;
+                                        }
                                         /* "continue": simulate end of loop */
                                         rword = RES_DONE;
                                         continue;
@@ -7502,7 +7513,6 @@ static int run_list(struct pipe *pi)
 #endif
 #if ENABLE_HUSH_FUNCTIONS
                                 if (G.flag_return_in_progress == 1) {
-                                        /* same as "goto check_jobs_and_break" */
                                         checkjobs(NULL);
                                         break;
                                 }
@@ -7544,6 +7554,9 @@ static int run_list(struct pipe *pi)
                 if (rword == RES_IF || rword == RES_ELIF)
                         cond_code = rcode;
 #endif
+ check_jobs_and_continue:
+                checkjobs(NULL);
+ dont_check_jobs_but_continue: ;
 #if ENABLE_HUSH_LOOPS
                 /* Beware of "while false; true; do ..."! */
                 if (pi->next
@@ -7555,22 +7568,17 @@ static int run_list(struct pipe *pi)
                                         /* "while false; do...done" - exitcode 0 */
                                         G.last_exitcode = rcode = EXIT_SUCCESS;
                                         debug_printf_exec(": while expr is false: breaking (exitcode:EXIT_SUCCESS)\n");
-                                        goto check_jobs_and_break;
+                                        break;
                                 }
                         }
                         if (rword == RES_UNTIL) {
                                 if (!rcode) {
                                         debug_printf_exec(": until expr is true: breaking\n");
- check_jobs_and_break:
-                                        checkjobs(NULL);
                                         break;
                                 }
                         }
                 }
 #endif
-
- check_jobs_and_continue:
-                checkjobs(NULL);
         } /* for (pi) */
 
 #if ENABLE_HUSH_JOB
@@ -8628,6 +8636,14 @@ static int FAST_FUNC builtin_help(char **argv UNUSED_PARAM)
 }
 #endif
 
+#if MAX_HISTORY && ENABLE_FEATURE_EDITING
+static int FAST_FUNC builtin_history(char **argv UNUSED_PARAM)
+{
+        show_history(G.line_input_state);
+        return EXIT_SUCCESS;
+}
+#endif
+
 #if ENABLE_HUSH_JOB
 static int FAST_FUNC builtin_jobs(char **argv UNUSED_PARAM)
 {
diff --git a/shell/hush_test/hush-misc/while4.right b/shell/hush_test/hush-misc/while4.right
new file mode 100644
index 000000000..7b24a35ff
--- /dev/null
+++ b/shell/hush_test/hush-misc/while4.right
@@ -0,0 +1 @@
+Ok:0
diff --git a/shell/hush_test/hush-misc/while4.tests b/shell/hush_test/hush-misc/while4.tests
new file mode 100755
index 000000000..ba80e603a
--- /dev/null
+++ b/shell/hush_test/hush-misc/while4.tests
@@ -0,0 +1,6 @@
+false
+while false && echo Not reached; do
+    echo BUG
+    break
+done
+echo Ok:$?
diff --git a/shell/shell_common.c b/shell/shell_common.c
index f7503cac5..84e0604ed 100644
--- a/shell/shell_common.c
+++ b/shell/shell_common.c
@@ -39,7 +39,7 @@ int FAST_FUNC is_well_formed_var_name(const char *s, char terminator)
 
 /* read builtin */
 
-/* Needs to be interruptible: shell mush handle traps and shell-special signals
+/* Needs to be interruptible: shell must handle traps and shell-special signals
  * while inside read. To implement this, be sure to not loop on EINTR
  * and return errno == EINTR reliably.
  */