dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-09-02 01:02:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix if / elif handling bug in HUSH shell

Browse Source
This commit is contained in:
wdenk
2004-04-12 14:31:43 +00:00
parent f525c8a147
commit 56b86bf0cd
3 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
CHANGELOG
View File

@@ -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:
====================================================================== ======================================================================

2
common/hush.c
View File

@@ -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" */

2
include/version.h
View File

@@ -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__ */