emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hush: enable NOMMU re-execution logic. Some testsuite entries

Browse Source 
fail on NOMMU. Before it was much worse.
 No regressions on MMU, size:

function                                             old     new   delta
handle_dollar                                        626     632      +6
run_list                                            2018    2022      +4
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 2/0 up/down: 10/0)               Total: 10 bytes
This commit is contained in:
Denis Vlasenko
2009-04-04 23:15:14 +00:00
parent 9aa7d6fdc5
commit 609f2ab434
1 changed files with 91 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

113
shell/hush.c
View File

@@ -2329,6 +2329,16 @@ static void pseudo_exec_argv(nommu_save_t *nommu_save,
_exit(EXIT_FAILURE); _exit(EXIT_FAILURE);
} }
static void re_execute_shell(const char *s) NORETURN;
static void re_execute_shell(const char *s)
{
//TODO: pass non-exported variables, traps, and functions
debug_printf_exec("re_execute_shell pid:%d cmd:'%s'", getpid(), s);
execl(bb_busybox_exec_path, "hush", "-c", s, NULL);
//TODO: fallback for init=/bin/hush?
_exit(127);
}
static int run_list(struct pipe *pi); static int run_list(struct pipe *pi);
/* Called after [v]fork() in run_pipe() /* Called after [v]fork() in run_pipe()
@@ -2360,8 +2370,7 @@ static void pseudo_exec(nommu_save_t *nommu_save,
* since this process is about to exit */ * since this process is about to exit */
_exit(rcode); _exit(rcode);
#else #else
bb_error_msg_and_die("NOMMU TODO: re-exec '%s'", re_execute_shell(command->group_as_string);
command->group_as_string);
#endif #endif
} }
@@ -3831,9 +3840,7 @@ static FILE *generate_stream_from_string(const char *s)
* huge=`cat TESTFILE` # was blocking here forever * huge=`cat TESTFILE` # was blocking here forever
* echo OK * echo OK
*/ */
//TODO: pass non-exported variables, traps, and functions re_execute_shell(s);
execl(bb_busybox_exec_path, "hush", "-c", s, NULL);
_exit(127);
#endif #endif
} }
@@ -4071,7 +4078,13 @@ static void add_till_closing_paren(o_string *dest, struct in_str *input, bool db
#endif /* ENABLE_HUSH_TICK || ENABLE_SH_MATH_SUPPORT */ #endif /* ENABLE_HUSH_TICK || ENABLE_SH_MATH_SUPPORT */
/* Return code: 0 for OK, 1 for syntax error */ /* Return code: 0 for OK, 1 for syntax error */
static int handle_dollar(o_string *dest, struct in_str *input) #if BB_MMU
#define handle_dollar(ctx, dest, input) \
handle_dollar(dest, input)
#endif
static int handle_dollar(struct parse_context *ctx,
o_string *dest,
struct in_str *input)
{ {
int expansion; int expansion;
int ch = i_peek(input); /* first character after the $ */ int ch = i_peek(input); /* first character after the $ */
@@ -4079,7 +4092,10 @@ static int handle_dollar(o_string *dest, struct in_str *input)
debug_printf_parse("handle_dollar entered: ch='%c'\n", ch); debug_printf_parse("handle_dollar entered: ch='%c'\n", ch);
if (isalpha(ch)) { if (isalpha(ch)) {
i_getch(input); ch = i_getch(input);
#if !BB_MMU
o_addchr(&ctx->as_string, ch);
#endif
make_var: make_var:
o_addchr(dest, SPECIAL_VAR_SYMBOL); o_addchr(dest, SPECIAL_VAR_SYMBOL);
while (1) { while (1) {
@@ -4089,12 +4105,18 @@ static int handle_dollar(o_string *dest, struct in_str *input)
ch = i_peek(input); ch = i_peek(input);
if (!isalnum(ch) && ch != '_') if (!isalnum(ch) && ch != '_')
break; break;
i_getch(input); ch = i_getch(input);
#if !BB_MMU
o_addchr(&ctx->as_string, ch);
#endif
} }
o_addchr(dest, SPECIAL_VAR_SYMBOL); o_addchr(dest, SPECIAL_VAR_SYMBOL);
} else if (isdigit(ch)) { } else if (isdigit(ch)) {
make_one_char_var: make_one_char_var:
i_getch(input); ch = i_getch(input);
#if !BB_MMU
o_addchr(&ctx->as_string, ch);
#endif
o_addchr(dest, SPECIAL_VAR_SYMBOL); o_addchr(dest, SPECIAL_VAR_SYMBOL);
debug_printf_parse(": '%c'\n", ch); debug_printf_parse(": '%c'\n", ch);
o_addchr(dest, ch | quote_mask); o_addchr(dest, ch | quote_mask);
@@ -4111,13 +4133,19 @@ static int handle_dollar(o_string *dest, struct in_str *input)
bool first_char, all_digits; bool first_char, all_digits;
o_addchr(dest, SPECIAL_VAR_SYMBOL); o_addchr(dest, SPECIAL_VAR_SYMBOL);
i_getch(input); ch = i_getch(input);
#if !BB_MMU
o_addchr(&ctx->as_string, ch);
#endif
/* XXX maybe someone will try to escape the '}' */ /* XXX maybe someone will try to escape the '}' */
expansion = 0; expansion = 0;
first_char = true; first_char = true;
all_digits = false; all_digits = false;
while (1) { while (1) {
ch = i_getch(input); ch = i_getch(input);
#if !BB_MMU
o_addchr(&ctx->as_string, ch);
#endif
if (ch == '}') if (ch == '}')
break; break;
@@ -4183,10 +4211,16 @@ static int handle_dollar(o_string *dest, struct in_str *input)
break; break;
} }
case '(': { case '(': {
i_getch(input); ch = i_getch(input);
#if !BB_MMU
o_addchr(&ctx->as_string, ch);
#endif
#if ENABLE_SH_MATH_SUPPORT #if ENABLE_SH_MATH_SUPPORT
if (i_peek(input) == '(') { if (i_peek(input) == '(') {
i_getch(input); ch = i_getch(input);
#if !BB_MMU
o_addchr(&ctx->as_string, ch);
#endif
o_addchr(dest, SPECIAL_VAR_SYMBOL); o_addchr(dest, SPECIAL_VAR_SYMBOL);
o_addchr(dest, /*quote_mask |*/ '+'); o_addchr(dest, /*quote_mask |*/ '+');
add_till_closing_paren(dest, input, true); add_till_closing_paren(dest, input, true);
@@ -4205,7 +4239,10 @@ static int handle_dollar(o_string *dest, struct in_str *input)
break; break;
} }
case '_': case '_':
i_getch(input); ch = i_getch(input);
#if !BB_MMU
o_addchr(&ctx->as_string, ch);
#endif
ch = i_peek(input); ch = i_peek(input);
if (isalnum(ch)) { /* it's $_name or $_123 */ if (isalnum(ch)) { /* it's $_name or $_123 */
ch = '_'; ch = '_';
@@ -4281,7 +4318,7 @@ static int parse_stream_dquoted(struct parse_context *ctx,
goto again; goto again;
} }
if (ch == '$') { if (ch == '$') {
if (handle_dollar(dest, input) != 0) { if (handle_dollar(ctx, dest, input) != 0) {
debug_printf_parse("parse_stream_dquoted return 1: " debug_printf_parse("parse_stream_dquoted return 1: "
"handle_dollar returned non-0\n"); "handle_dollar returned non-0\n");
return 1; return 1;
@@ -4477,7 +4514,12 @@ static struct pipe *parse_stream(char **pstring,
if (ch == EOF || ch == '\n') if (ch == EOF || ch == '\n')
break; break;
i_getch(input); i_getch(input);
/* note: we do not add it to &ctx.as_string */
} }
#if !BB_MMU
//TODO: go back one char?
o_addchr(&ctx.as_string, '\n');
#endif
} else { } else {
o_addQchr(&dest, ch); o_addQchr(&dest, ch);
} }
@@ -4488,10 +4530,15 @@ static struct pipe *parse_stream(char **pstring,
goto parse_error; goto parse_error;
} }
o_addchr(&dest, '\\'); o_addchr(&dest, '\\');
o_addchr(&dest, i_getch(input)); ch = i_getch(input);
o_addchr(&dest, ch);
#if !BB_MMU
o_addchr(&ctx.as_string, ch);
#endif
break; break;
case '$': case '$':
if (handle_dollar(&dest, input) != 0) { //NOMMU TODO!
if (handle_dollar(&ctx, &dest, input) != 0) {
debug_printf_parse("parse_stream parse error: " debug_printf_parse("parse_stream parse error: "
"handle_dollar returned non-0\n"); "handle_dollar returned non-0\n");
goto parse_error; goto parse_error;
@@ -4505,6 +4552,9 @@ static struct pipe *parse_stream(char **pstring,
syntax("unterminated '"); syntax("unterminated '");
goto parse_error; goto parse_error;
} }
#if !BB_MMU
o_addchr(&ctx.as_string, ch);
#endif
if (ch == '\'') if (ch == '\'')
break; break;
if (dest.o_assignment == NOT_ASSIGNMENT) if (dest.o_assignment == NOT_ASSIGNMENT)
@@ -4538,7 +4588,10 @@ static struct pipe *parse_stream(char **pstring,
redir_style = REDIRECT_OVERWRITE; redir_style = REDIRECT_OVERWRITE;
if (next == '>') { if (next == '>') {
redir_style = REDIRECT_APPEND; redir_style = REDIRECT_APPEND;
i_getch(input); ch = i_getch(input);
#if !BB_MMU
o_addchr(&ctx.as_string, ch);
#endif
} }
#if 0 #if 0
else if (next == '(') { else if (next == '(') {
@@ -4556,10 +4609,16 @@ static struct pipe *parse_stream(char **pstring,
redir_style = REDIRECT_INPUT; redir_style = REDIRECT_INPUT;
if (next == '<') { if (next == '<') {
redir_style = REDIRECT_HEREIS; redir_style = REDIRECT_HEREIS;
i_getch(input); ch = i_getch(input);
#if !BB_MMU
o_addchr(&ctx.as_string, ch);
#endif
} else if (next == '>') { } else if (next == '>') {
redir_style = REDIRECT_IO; redir_style = REDIRECT_IO;
i_getch(input); ch = i_getch(input);
#if !BB_MMU
o_addchr(&ctx.as_string, ch);
#endif
} }
#if 0 #if 0
else if (next == '(') { else if (next == '(') {
@@ -4584,7 +4643,10 @@ static struct pipe *parse_stream(char **pstring,
ch = i_peek(input); ch = i_peek(input);
if (ch != ';') if (ch != ';')
break; break;
i_getch(input); ch = i_getch(input);
#if !BB_MMU
o_addchr(&ctx.as_string, ch);
#endif
if (ctx.ctx_res_w == RES_CASEI) { if (ctx.ctx_res_w == RES_CASEI) {
ctx.ctx_dsemicolon = 1; ctx.ctx_dsemicolon = 1;
ctx.ctx_res_w = RES_MATCH; ctx.ctx_res_w = RES_MATCH;
@@ -4602,7 +4664,10 @@ static struct pipe *parse_stream(char **pstring,
goto parse_error; goto parse_error;
} }
if (next == '&') { if (next == '&') {
i_getch(input); ch = i_getch(input);
#if !BB_MMU
o_addchr(&ctx.as_string, ch);
#endif
done_pipe(&ctx, PIPE_AND); done_pipe(&ctx, PIPE_AND);
} else { } else {
done_pipe(&ctx, PIPE_BG); done_pipe(&ctx, PIPE_BG);
@@ -4617,7 +4682,10 @@ static struct pipe *parse_stream(char **pstring,
break; /* we are in case's "word | word)" */ break; /* we are in case's "word | word)" */
#endif #endif
if (next == '|') { /* || */ if (next == '|') { /* || */
i_getch(input); ch = i_getch(input);
#if !BB_MMU
o_addchr(&ctx.as_string, ch);
#endif
done_pipe(&ctx, PIPE_OR); done_pipe(&ctx, PIPE_OR);
} else { } else {
/* we could pick up a file descriptor choice here /* we could pick up a file descriptor choice here
@@ -4647,6 +4715,7 @@ static struct pipe *parse_stream(char **pstring,
) { ) {
bb_error_msg("seems like a function definition"); bb_error_msg("seems like a function definition");
i_getch(input); i_getch(input);
//if !BB_MMU o_addchr(&ctx.as_string...
do { do {
//TODO: do it properly. //TODO: do it properly.
ch = i_getch(input); ch = i_getch(input);