Don't reset parents context when we encounter an terminator. Fixes

if true; then if true; then true; fi; fi

diff --git a/hush.c b/hush.c
index 71e40489dd8699d4322c30b5edefffdd01ad1ec1..976fa3805d1c3c80be15a1b7846b10800ae0f6aa 100644 (file)
--- a/hush.c
+++ b/hush.c
@@ -1660,7 +1660,6 @@ int reserved_word(o_string *dest, struct p_context *ctx)
                                old->child->group = ctx->list_head;
                                *ctx = *old;   /* physical copy */
                                free(old);
-                               ctx->w=RES_NONE;
                        }
                        b_reset (dest);
                        return 1;

diff --git a/shell/hush.c b/shell/hush.c
index 71e40489dd8699d4322c30b5edefffdd01ad1ec1..976fa3805d1c3c80be15a1b7846b10800ae0f6aa 100644 (file)
--- a/shell/hush.c
+++ b/shell/hush.c
@@ -1660,7 +1660,6 @@ int reserved_word(o_string *dest, struct p_context *ctx)
                                old->child->group = ctx->list_head;
                                *ctx = *old;   /* physical copy */
                                free(old);
-                               ctx->w=RES_NONE;
                        }
                        b_reset (dest);
                        return 1;