diff options
Diffstat (limited to 'shell/ash.c')
-rw-r--r-- | shell/ash.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/shell/ash.c b/shell/ash.c index f1c21188e..5a001b004 100644 --- a/shell/ash.c +++ b/shell/ash.c | |||
@@ -13265,10 +13265,14 @@ readtoken(void) | |||
13265 | if (kwd & CHKNL) { | 13265 | if (kwd & CHKNL) { |
13266 | while (t == TNL) { | 13266 | while (t == TNL) { |
13267 | parseheredoc(); | 13267 | parseheredoc(); |
13268 | checkkwd = 0; | ||
13268 | t = xxreadtoken(); | 13269 | t = xxreadtoken(); |
13269 | } | 13270 | } |
13270 | } | 13271 | } |
13271 | 13272 | ||
13273 | kwd |= checkkwd; | ||
13274 | checkkwd = 0; | ||
13275 | |||
13272 | if (t != TWORD || quoteflag) { | 13276 | if (t != TWORD || quoteflag) { |
13273 | goto out; | 13277 | goto out; |
13274 | } | 13278 | } |
@@ -13287,7 +13291,7 @@ readtoken(void) | |||
13287 | } | 13291 | } |
13288 | } | 13292 | } |
13289 | 13293 | ||
13290 | if (checkkwd & CHKALIAS) { | 13294 | if (kwd & CHKALIAS) { |
13291 | #if ENABLE_ASH_ALIAS | 13295 | #if ENABLE_ASH_ALIAS |
13292 | struct alias *ap; | 13296 | struct alias *ap; |
13293 | ap = lookupalias(wordtext, 1); | 13297 | ap = lookupalias(wordtext, 1); |
@@ -13300,7 +13304,6 @@ readtoken(void) | |||
13300 | #endif | 13304 | #endif |
13301 | } | 13305 | } |
13302 | out: | 13306 | out: |
13303 | checkkwd = 0; | ||
13304 | #if DEBUG | 13307 | #if DEBUG |
13305 | if (!alreadyseen) | 13308 | if (!alreadyseen) |
13306 | TRACE(("token '%s' %s\n", tokname_array[t], t == TWORD ? wordtext : "")); | 13309 | TRACE(("token '%s' %s\n", tokname_array[t], t == TWORD ? wordtext : "")); |