diff options
| author | wdenk <wdenk> | 2004-04-12 14:31:43 +0000 |
|---|---|---|
| committer | wdenk <wdenk> | 2004-04-12 14:31:43 +0000 |
| commit | 56b86bf0cd6ce45d337154c133ab361120ee5569 (patch) | |
| tree | d4038443cceababd417b597df03705f4a6d54fef | |
| parent | f525c8a1476945b078ce4ffe6cf768c286cbf8cc (diff) | |
| download | olio-uboot-2014.01-56b86bf0cd6ce45d337154c133ab361120ee5569.tar.xz olio-uboot-2014.01-56b86bf0cd6ce45d337154c133ab361120ee5569.zip | |
Fix if / elif handling bug in HUSH shell
| -rw-r--r-- | CHANGELOG | 6 | ||||
| -rw-r--r-- | common/hush.c | 2 | ||||
| -rw-r--r-- | include/version.h | 2 |
3 files changed, 8 insertions, 2 deletions
@@ -1,4 +1,10 @@ ====================================================================== +Changes for U-Boot 1.1.1: +====================================================================== + +* Fix if / elif handling bug in HUSH shell + +====================================================================== Changes for U-Boot 1.1.0: ====================================================================== diff --git a/common/hush.c b/common/hush.c index 4712adcbf..eeb970cd5 100644 --- a/common/hush.c +++ b/common/hush.c @@ -1843,7 +1843,7 @@ static int run_list_real(struct pipe *pi) if (rmode == RES_THEN || rmode == RES_ELSE) if_code = next_if_code; if (rmode == RES_THEN && if_code) continue; if (rmode == RES_ELSE && !if_code) continue; - if (rmode == RES_ELIF && !if_code) continue; + if (rmode == RES_ELIF && !if_code) break; if (rmode == RES_FOR && pi->num_progs) { if (!list) { /* if no variable values after "in" we skip "for" */ diff --git a/include/version.h b/include/version.h index e91860f42..90eb79db3 100644 --- a/include/version.h +++ b/include/version.h @@ -24,6 +24,6 @@ #ifndef __VERSION_H__ #define __VERSION_H__ -#define U_BOOT_VERSION "U-Boot 1.1.0" +#define U_BOOT_VERSION "U-Boot 1.1.1" #endif /* __VERSION_H__ */ |