Merge branch 'busybox' into mergeFRP-3466-g53c09d0e1

6 files changed, 9 insertions, 13 deletions

diff --git a/shell/ash.c b/shell/ash.c
index c6f64e202..27e097a99 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -9251,7 +9251,6 @@ typecmd(int argc UNUSED_PARAM, char **argv)
         return err;
 }
 
-#if ENABLE_ASH_CMDCMD
 static struct strlist *
 fill_arglist(struct arglist *arglist, union node **argpp)
 {
@@ -9268,6 +9267,7 @@ fill_arglist(struct arglist *arglist, union node **argpp)
         return *lastp;
 }
 
+#if ENABLE_ASH_CMDCMD
 /* Is it "command [-p] PROG ARGS" bltin, no other opts? Return ptr to "PROG" if yes */
 static int
 parse_command_args(struct arglist *arglist, union node **argpp, const char **path)
@@ -10882,11 +10882,13 @@ evalcommand(union node *cmd, int flags)
                                 vlocal = !spclbltin;
                         }
                         cmd_is_exec = cmdentry.u.cmd == EXECCMD;
+#if ENABLE_ASH_CMDCMD
                         if (cmdentry.u.cmd != COMMANDCMD)
                                 break;
 
                         cmd_flag = parse_command_args(&arglist, &argp, &path);
                         if (!cmd_flag)
+#endif
                                 break;
                 }
 
@@ -14574,8 +14576,7 @@ helpcmd(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
 static int FAST_FUNC
 historycmd(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
 {
-        if (line_input_state)
-                show_history(line_input_state);
+        show_history(line_input_state);
         return EXIT_SUCCESS;
 }
 #endif
diff --git a/shell/ash_test/ash-misc/exitcode_trap2.tests b/shell/ash_test/ash-misc/exitcode_trap2.tests
index f259774bf..aff6d5187 100755
--- a/shell/ash_test/ash-misc/exitcode_trap2.tests
+++ b/shell/ash_test/ash-misc/exitcode_trap2.tests
@@ -3,7 +3,6 @@
 $THIS_SH -c '
  trap "false;exit" term
  kill $$ &
- (exit 42)
- wait
+ (sleep 1; exit 42)
 '
 echo 42:$?
diff --git a/shell/ash_test/ash-misc/exitcode_trap6.tests b/shell/ash_test/ash-misc/exitcode_trap6.tests
index 15fb99d2d..59a07fc91 100755
--- a/shell/ash_test/ash-misc/exitcode_trap6.tests
+++ b/shell/ash_test/ash-misc/exitcode_trap6.tests
@@ -5,7 +5,6 @@ $THIS_SH -c '
  trap "echo INT" int
  trap "kill -int $$;exit" term
  kill $$ &
- (exit 42)
- wait
+ (sleep 1; exit 42)
 '
 echo 42:$?
diff --git a/shell/hush.c b/shell/hush.c
index 0a92f5da7..cab7ea5b0 100644
--- a/shell/hush.c
+++ b/shell/hush.c
@@ -10461,8 +10461,7 @@ static int FAST_FUNC builtin_help(char **argv UNUSED_PARAM)
 #if MAX_HISTORY && ENABLE_FEATURE_EDITING
 static int FAST_FUNC builtin_history(char **argv UNUSED_PARAM)
 {
-        if (G.line_input_state)
-                show_history(G.line_input_state);
+        show_history(G.line_input_state);
         return EXIT_SUCCESS;
 }
 #endif
diff --git a/shell/hush_test/hush-misc/exitcode_trap2.tests b/shell/hush_test/hush-misc/exitcode_trap2.tests
index f259774bf..aff6d5187 100755
--- a/shell/hush_test/hush-misc/exitcode_trap2.tests
+++ b/shell/hush_test/hush-misc/exitcode_trap2.tests
@@ -3,7 +3,6 @@
 $THIS_SH -c '
  trap "false;exit" term
  kill $$ &
- (exit 42)
- wait
+ (sleep 1; exit 42)
 '
 echo 42:$?
diff --git a/shell/hush_test/hush-misc/exitcode_trap6.tests b/shell/hush_test/hush-misc/exitcode_trap6.tests
index 15fb99d2d..59a07fc91 100755
--- a/shell/hush_test/hush-misc/exitcode_trap6.tests
+++ b/shell/hush_test/hush-misc/exitcode_trap6.tests
@@ -5,7 +5,6 @@ $THIS_SH -c '
  trap "echo INT" int
  trap "kill -int $$;exit" term
  kill $$ &
- (exit 42)
- wait
+ (sleep 1; exit 42)
 '
 echo 42:$?