1 files changed, 51 insertions, 31 deletions

diff --git a/shell/hush.c b/shell/hush.c
index 3ca04494c..eabe83ac6 100644
--- a/shell/hush.c
+++ b/shell/hush.c
@@ -1479,10 +1479,11 @@ static sighandler_t install_sighandler(int sig, sighandler_t handler)
 
 #if ENABLE_HUSH_JOB
 
+static void xfunc_has_died(void);
 /* After [v]fork, in child: do not restore tty pgrp on xfunc death */
-# define disable_restore_tty_pgrp_on_exit() (die_sleep = 0)
+# define disable_restore_tty_pgrp_on_exit() (die_func = NULL)
 /* After [v]fork, in parent: restore tty pgrp on xfunc death */
-# define enable_restore_tty_pgrp_on_exit()  (die_sleep = -1)
+# define enable_restore_tty_pgrp_on_exit()  (die_func = xfunc_has_died)
 
 /* Restores tty foreground process group, and exits.
  * May be called as signal handler for fatal signal
@@ -1587,6 +1588,15 @@ static void hush_exit(int exitcode)
 #endif
 }
 
+static void xfunc_has_died(void) NORETURN;
+static void xfunc_has_died(void)
+{
+        /* xfunc has failed! die die die */
+        /* no EXIT traps, this is an escape hatch! */
+        G.exiting = 1;
+        hush_exit(xfunc_error_retval);
+}
+
 
 //TODO: return a mask of ALL handled sigs?
 static int check_and_run_traps(void)
@@ -3161,11 +3171,29 @@ static int reserved_word(o_string *word, struct parse_context *ctx)
                 old->command->group = ctx->list_head;
                 old->command->cmd_type = CMD_NORMAL;
 # if !BB_MMU
-                o_addstr(&old->as_string, ctx->as_string.data);
-                o_free_unsafe(&ctx->as_string);
-                old->command->group_as_string = xstrdup(old->as_string.data);
-                debug_printf_parse("pop, remembering as:'%s'\n",
-                                old->command->group_as_string);
+                /* At this point, the compound command's string is in
+                 * ctx->as_string... except for the leading keyword!
+                 * Consider this example: "echo a | if true; then echo a; fi"
+                 * ctx->as_string will contain "true; then echo a; fi",
+                 * with "if " remaining in old->as_string!
+                 */
+                {
+                        char *str;
+                        int len = old->as_string.length;
+                        /* Concatenate halves */
+                        o_addstr(&old->as_string, ctx->as_string.data);
+                        o_free_unsafe(&ctx->as_string);
+                        /* Find where leading keyword starts in first half */
+                        str = old->as_string.data + len;
+                        if (str > old->as_string.data)
+                                str--; /* skip whitespace after keyword */
+                        while (str > old->as_string.data && isalpha(str[-1]))
+                                str--;
+                        /* Ugh, we're done with this horrid hack */
+                        old->command->group_as_string = xstrdup(str);
+                        debug_printf_parse("pop, remembering as:'%s'\n",
+                                        old->command->group_as_string);
+                }
 # endif
                 *ctx = *old;   /* physical copy */
                 free(old);
@@ -4248,7 +4276,7 @@ static struct pipe *parse_stream(char **pstring,
                                 pi = NULL;
                         }
 #if !BB_MMU
-                        debug_printf_parse("as_string '%s'\n", ctx.as_string.data);
+                        debug_printf_parse("as_string1 '%s'\n", ctx.as_string.data);
                         if (pstring)
                                 *pstring = ctx.as_string.data;
                         else
@@ -4399,7 +4427,7 @@ static struct pipe *parse_stream(char **pstring,
                         ) {
                                 o_free(&dest);
 #if !BB_MMU
-                                debug_printf_parse("as_string '%s'\n", ctx.as_string.data);
+                                debug_printf_parse("as_string2 '%s'\n", ctx.as_string.data);
                                 if (pstring)
                                         *pstring = ctx.as_string.data;
                                 else
@@ -4639,9 +4667,6 @@ static struct pipe *parse_stream(char **pstring,
                                  * with redirect_opt_num(), but bash doesn't do it.
                                  * "echo foo 2| cat" yields "foo 2". */
                                 done_command(&ctx);
-#if !BB_MMU
-                                o_reset_to_empty_unquoted(&ctx.as_string);
-#endif
                         }
                         goto new_cmd;
                 case '(':
@@ -6779,7 +6804,7 @@ static int checkjobs(struct pipe *fg_pipe)
                                                 int sig = WTERMSIG(status);
                                                 if (i == fg_pipe->num_cmds-1)
                                                         /* TODO: use strsignal() instead for bash compat? but that's bloat... */
-                                                        printf("%s\n", sig == SIGINT || sig == SIGPIPE ? "" : get_signame(sig));
+                                                        puts(sig == SIGINT || sig == SIGPIPE ? "" : get_signame(sig));
                                                 /* TODO: if (WCOREDUMP(status)) + " (core dumped)"; */
                                                 /* TODO: MIPS has 128 sigs (1..128), what if sig==128 here?
                                                  * Maybe we need to use sig | 128? */
@@ -7851,12 +7876,7 @@ int hush_main(int argc, char **argv)
         /* Initialize some more globals to non-zero values */
         cmdedit_update_prompt();
 
-        if (setjmp(die_jmp)) {
-                /* xfunc has failed! die die die */
-                /* no EXIT traps, this is an escape hatch! */
-                G.exiting = 1;
-                hush_exit(xfunc_error_retval);
-        }
+        die_func = xfunc_has_died;
 
         /* Shell is non-interactive at first. We need to call
          * install_special_sighandlers() if we are going to execute "sh <script>",
@@ -8114,9 +8134,7 @@ int hush_main(int argc, char **argv)
                         /* Grab control of the terminal */
                         tcsetpgrp(G_interactive_fd, getpid());
                 }
-                /* -1 is special - makes xfuncs longjmp, not exit
-                 * (we reset die_sleep = 0 whereever we [v]fork) */
-                enable_restore_tty_pgrp_on_exit(); /* sets die_sleep = -1 */
+                enable_restore_tty_pgrp_on_exit();
 
 # if ENABLE_HUSH_SAVEHISTORY && MAX_HISTORY > 0
                 {
@@ -8950,24 +8968,29 @@ static int FAST_FUNC builtin_umask(char **argv)
         int rc;
         mode_t mask;
 
+        rc = 1;
         mask = umask(0);
         argv = skip_dash_dash(argv);
         if (argv[0]) {
                 mode_t old_mask = mask;
 
-                mask ^= 0777;
-                rc = bb_parse_mode(argv[0], &mask);
-                mask ^= 0777;
-                if (rc == 0) {
+                /* numeric umasks are taken as-is */
+                /* symbolic umasks are inverted: "umask a=rx" calls umask(222) */
+                if (!isdigit(argv[0][0]))
+                        mask ^= 0777;
+                mask = bb_parse_mode(argv[0], mask);
+                if (!isdigit(argv[0][0]))
+                        mask ^= 0777;
+                if ((unsigned)mask > 0777) {
                         mask = old_mask;
                         /* bash messages:
                          * bash: umask: 'q': invalid symbolic mode operator
                          * bash: umask: 999: octal number out of range
                          */
                         bb_error_msg("%s: invalid mode '%s'", "umask", argv[0]);
+                        rc = 0;
                 }
         } else {
-                rc = 1;
                 /* Mimic bash */
                 printf("%04o\n", (unsigned) mask);
                 /* fall through and restore mask which we set to 0 */
@@ -9097,12 +9120,9 @@ static int FAST_FUNC builtin_wait(char **argv)
                         return EXIT_FAILURE;
                 }
                 if (waitpid(pid, &status, 0) == pid) {
+                        ret = WEXITSTATUS(status);
                         if (WIFSIGNALED(status))
                                 ret = 128 + WTERMSIG(status);
-                        else if (WIFEXITED(status))
-                                ret = WEXITSTATUS(status);
-                        else /* wtf? */
-                                ret = EXIT_FAILURE;
                 } else {
                         bb_perror_msg("wait %s", *argv);
                         ret = 127;