Fix if / elif handling bug in HUSH shell
This commit is contained in:
parent
f525c8a147
commit
56b86bf0cd
|
@ -1,3 +1,9 @@
|
||||||
|
======================================================================
|
||||||
|
Changes for U-Boot 1.1.1:
|
||||||
|
======================================================================
|
||||||
|
|
||||||
|
* Fix if / elif handling bug in HUSH shell
|
||||||
|
|
||||||
======================================================================
|
======================================================================
|
||||||
Changes for U-Boot 1.1.0:
|
Changes for U-Boot 1.1.0:
|
||||||
======================================================================
|
======================================================================
|
||||||
|
|
|
@ -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 || rmode == RES_ELSE) if_code = next_if_code;
|
||||||
if (rmode == RES_THEN && if_code) continue;
|
if (rmode == RES_THEN && if_code) continue;
|
||||||
if (rmode == RES_ELSE && !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 (rmode == RES_FOR && pi->num_progs) {
|
||||||
if (!list) {
|
if (!list) {
|
||||||
/* if no variable values after "in" we skip "for" */
|
/* if no variable values after "in" we skip "for" */
|
||||||
|
|
|
@ -24,6 +24,6 @@
|
||||||
#ifndef __VERSION_H__
|
#ifndef __VERSION_H__
|
||||||
#define __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__ */
|
#endif /* __VERSION_H__ */
|
||||||
|
|
Loading…
Reference in New Issue