Merge branch 'busybox' into merge

3 files changed, 18 insertions, 7 deletions

diff --git a/shell/ash.c b/shell/ash.c
index 7a50e73f3..75c01ec14 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -3737,7 +3737,8 @@ set_curjob(struct job *jp, unsigned mode)
                 break;
         case CUR_RUNNING:
                 /* newly created job or backgrounded job,
-                   put after all stopped jobs. */
+                 * put after all stopped jobs.
+                 */
                 while (1) {
                         jp1 = *jpp;
 #if JOBS
@@ -9101,8 +9102,17 @@ expredir(union node *n)
 #if ENABLE_ASH_BASH_COMPAT
  store_expfname:
 #endif
+#if 0
+// By the design of stack allocator, the loop of this kind:
+//      while true; do while true; do break; done </dev/null; done
+// will look like a memory leak: ash plans to free expfname's
+// of "/dev/null" as soon as it finishes running the loop
+// (in this case, never).
+// This "fix" is wrong:
                         if (redir->nfile.expfname)
                                 stunalloc(redir->nfile.expfname);
+// It results in corrupted state of stacked allocations.
+#endif
                         redir->nfile.expfname = fn.list->text;
                         break;
                 case NFROMFD:
@@ -12138,8 +12148,9 @@ parsebackq: {
         INT_ON;
         if (oldstyle) {
                 /* We must read until the closing backquote, giving special
-                   treatment to some slashes, and then push the string and
-                   reread it as input, interpreting it normally.  */
+                 * treatment to some slashes, and then push the string and
+                 * reread it as input, interpreting it normally.
+                 */
                 char *pout;
                 size_t psavelen;
                 char *pstr;
diff --git a/shell/hush.c b/shell/hush.c
index b9e763cc8..e2dc1e2d0 100644
--- a/shell/hush.c
+++ b/shell/hush.c
@@ -4219,7 +4219,7 @@ static struct pipe *parse_stream(char **pstring,
                         /* (this makes bare "&" cmd a no-op.
                          * bash says: "syntax error near unexpected token '&'") */
                         if (pi->num_cmds == 0
-                            IF_HAS_KEYWORDS( && pi->res_word == RES_NONE)
+                        IF_HAS_KEYWORDS(&& pi->res_word == RES_NONE)
                         ) {
                                 free_pipe_list(pi);
                                 pi = NULL;
@@ -4372,7 +4372,7 @@ static struct pipe *parse_stream(char **pstring,
                         debug_printf_parse("dest.o_assignment='%s'\n", assignment_flag[dest.o_assignment]);
                         /* Do we sit outside of any if's, loops or case's? */
                         if (!HAS_KEYWORDS
-                         IF_HAS_KEYWORDS(|| (ctx.ctx_res_w == RES_NONE && ctx.old_flag == 0))
+                        IF_HAS_KEYWORDS(|| (ctx.ctx_res_w == RES_NONE && ctx.old_flag == 0))
                         ) {
                                 o_free(&dest);
 #if !BB_MMU
@@ -8281,7 +8281,7 @@ static int FAST_FUNC builtin_exit(char **argv)
          * (if there are _stopped_ jobs, running ones don't count)
          * # exit
          * exit
-         # EEE (then bash exits)
+         * EEE (then bash exits)
          *
          * TODO: we can use G.exiting = -1 as indicator "last cmd was exit"
          */
diff --git a/shell/math.c b/shell/math.c
index 760645d0f..15c003965 100644
--- a/shell/math.c
+++ b/shell/math.c
@@ -410,7 +410,7 @@ arith_apply(arith_state_t *math_state, operator op, var_or_num_t *numstack, var_
                                 return "exponent less than 0";
                         c = 1;
                         while (--right_side_val >= 0)
-                            c *= rez;
+                                c *= rez;
                         rez = c;
                 }
                 else if (right_side_val == 0)