svn commit: trunk/busybox/shell
vda at busybox.net
vda at busybox.net
Wed Jul 9 13:14:55 PDT 2008
Author: vda
Date: 2008-07-09 13:14:53 -0700 (Wed, 09 Jul 2008)
New Revision: 22721
Log:
hush: compile fixes for !LOOPS case
Modified:
trunk/busybox/shell/hush.c
Changeset:
Modified: trunk/busybox/shell/hush.c
===================================================================
--- trunk/busybox/shell/hush.c 2008-07-09 20:07:59 UTC (rev 22720)
+++ trunk/busybox/shell/hush.c 2008-07-09 20:14:53 UTC (rev 22721)
@@ -2931,8 +2931,10 @@
}
#if HAS_KEYWORDS
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_IN
+#endif
) {
debug_printf_parse(": checking '%s' for reserved-ness\n", word->data);
if (reserved_word(word, ctx)) {
@@ -3049,9 +3051,11 @@
* RES_FOR and RES_IN are NOT sticky (needed to support
* cases where variable or value happens to match a keyword):
*/
+#if ENABLE_HUSH_LOOPS
if (ctx->ctx_res_w == RES_FOR
|| ctx->ctx_res_w == RES_IN)
ctx->ctx_res_w = RES_NONE;
+#endif
/* Create the memory for child, roughly:
* ctx->pipe->progs = new struct child_prog;
* ctx->pipe->progs[0].family = ctx->pipe;
More information about the busybox-cvs
mailing list