Merge commit 'e4dcba1c103dc28e927e004791e331aaf604383d'

Conflicts:
	libbb/make_directory.c

2 files changed, 4 insertions, 4 deletions

diff --git a/shell/ash.c b/shell/ash.c
index 45ec13097..ccf4288a9 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -7978,7 +7978,7 @@ hashcd(void)
                 for (cmdp = *pp; cmdp; cmdp = cmdp->next) {
                         if (cmdp->cmdtype == CMDNORMAL
                          || (cmdp->cmdtype == CMDBUILTIN
-                             && !IS_BUILTIN_REGULAR(cmdp->param.cmd)
+                             && !IS_BUILTIN_REGULAR(cmdp->param.cmd)
                              && builtinloc > 0)
                         ) {
                                 cmdp->rehash = 1;
@@ -12825,7 +12825,7 @@ find_command(char *name, struct cmdentry *entry, int act, const char *path)
                         }
                         if ((act & DO_NOFUNC)
                          || !prefix(pathopt, "func")
-                        ) {     /* ignore unimplemented options */
+                        ) {     /* ignore unimplemented options */
                                 continue;
                         }
                 }
diff --git a/shell/hush.c b/shell/hush.c
index 75083dc2e..9dd30c436 100644
--- a/shell/hush.c
+++ b/shell/hush.c
@@ -2765,7 +2765,7 @@ static const struct reserved_combo* match_reserved_word(o_string *word)
         };
         const struct reserved_combo *r;
 
-        for (r = reserved_list; r < reserved_list + ARRAY_SIZE(reserved_list); r++) {
+        for (r = reserved_list; r < reserved_list + ARRAY_SIZE(reserved_list); r++) {
                 if (strcmp(word->data, r->literal) == 0)
                         return r;
         }
@@ -4660,7 +4660,7 @@ static NOINLINE const char *expand_one_var(char **to_be_freed_pp, char *arg, cha
                                 char *exp_exp_word;
                                 char *loc;
                                 unsigned scan_flags = pick_scan(exp_op, *exp_word);
-                                if (exp_op == *exp_word)        /* ## or %% */
+                                if (exp_op == *exp_word)  /* ## or %% */
                                         exp_word++;
                                 exp_exp_word = encode_then_expand_string(exp_word, /*process_bkslash:*/ 1, /*unbackslash:*/ 1);
                                 if (exp_exp_word)