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

hush: compile fixes for !LOOPS case

Browse Source
This commit is contained in:
Denis Vlasenko 2008-07-09 20:14:53 +00:00
parent 7c053262af
commit 6bdff08e6c
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
shell/hush.c
View File

@ -2931,8 +2931,10 @@ static int done_word(o_string *word, struct p_context *ctx)
} }
#if HAS_KEYWORDS #if HAS_KEYWORDS
if (!child->argv /* if it's the first word... */ if (!child->argv /* if it's the first word... */
#if ENABLE_HUSH_LOOPS
&& ctx->ctx_res_w != RES_FOR /* ...not after FOR or IN */ && ctx->ctx_res_w != RES_FOR /* ...not after FOR or IN */
&& ctx->ctx_res_w != RES_IN && ctx->ctx_res_w != RES_IN
#endif
) { ) {
debug_printf_parse(": checking '%s' for reserved-ness\n", word->data); debug_printf_parse(": checking '%s' for reserved-ness\n", word->data);
if (reserved_word(word, ctx)) { if (reserved_word(word, ctx)) {
@ -3049,9 +3051,11 @@ static void done_pipe(struct p_context *ctx, pipe_style type)
* RES_FOR and RES_IN are NOT sticky (needed to support * RES_FOR and RES_IN are NOT sticky (needed to support
* cases where variable or value happens to match a keyword): * cases where variable or value happens to match a keyword):
*/ */
#if ENABLE_HUSH_LOOPS
if (ctx->ctx_res_w == RES_FOR if (ctx->ctx_res_w == RES_FOR
|| ctx->ctx_res_w == RES_IN) || ctx->ctx_res_w == RES_IN)
ctx->ctx_res_w = RES_NONE; ctx->ctx_res_w = RES_NONE;
#endif
/* Create the memory for child, roughly: /* Create the memory for child, roughly:
* ctx->pipe->progs = new struct child_prog; * ctx->pipe->progs = new struct child_prog;
* ctx->pipe->progs[0].family = ctx->pipe; * ctx->pipe->progs[0].family = ctx->pipe;