Merge branch 'busybox' into merge

3 files changed, 6 insertions, 6 deletions

diff --git a/shell/ash.c b/shell/ash.c
index 6d5c55d70..50d5ce9d4 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -31,7 +31,7 @@
  */
 
 //config:config ASH
-//config:       bool "ash (77 kb)"
+//config:       bool "ash (78 kb)"
 //config:       default y
 //config:       depends on !NOMMU
 //config:       help
@@ -4600,7 +4600,7 @@ wait_block_or_sig(int *status)
                 /* Children exist, but none are ready. Sleep until interesting signal */
 #if 1
                 sigfillset(&mask);
-                sigprocmask(SIG_SETMASK, &mask, &mask);
+                sigprocmask2(SIG_SETMASK, &mask); /* mask is updated */
                 while (!got_sigchld && !pending_sig)
                         sigsuspend(&mask);
                 sigprocmask(SIG_SETMASK, &mask, NULL);
diff --git a/shell/cttyhack.c b/shell/cttyhack.c
index ec1b6c429..b9ee59bd0 100644
--- a/shell/cttyhack.c
+++ b/shell/cttyhack.c
@@ -5,7 +5,7 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 //config:config CTTYHACK
-//config:       bool "cttyhack (2.5 kb)"
+//config:       bool "cttyhack (2.4 kb)"
 //config:       default y
 //config:       help
 //config:       One common problem reported on the mailing list is the "can't
diff --git a/shell/hush.c b/shell/hush.c
index 90191408d..920a85299 100644
--- a/shell/hush.c
+++ b/shell/hush.c
@@ -93,7 +93,7 @@
  * add =~ regex match operator: STR =~ REGEX
  */
 //config:config HUSH
-//config:       bool "hush (64 kb)"
+//config:       bool "hush (68 kb)"
 //config:       default y
 //config:       help
 //config:       hush is a small shell. It handles the normal flow control
@@ -5998,7 +5998,7 @@ static const char *first_special_char_in_vararg(const char *cp)
 #endif
 static char *encode_then_expand_vararg(const char *str, int handle_squotes, int do_unbackslash)
 {
-#if !BASH_PATTERN_SUBST
+#if !BASH_PATTERN_SUBST && ENABLE_HUSH_CASE
         const int do_unbackslash = 0;
 #endif
         char *exp_str;
@@ -11442,7 +11442,7 @@ static int wait_for_child_or_signal(struct pipe *waitfor_pipe, pid_t waitfor_pid
                  * and get stuck in sigsuspend...
                  */
                 sigfillset(&oldset); /* block all signals, remember old set */
-                sigprocmask(SIG_SETMASK, &oldset, &oldset);
+                sigprocmask2(SIG_SETMASK, &oldset);
 
                 if (!sigisemptyset(&G.pending_set)) {
                         /* Crap! we raced with some signal! */