From 56b86bf0cd6ce45d337154c133ab361120ee5569 Mon Sep 17 00:00:00 2001
From: wdenk <wdenk>
Date: Mon, 12 Apr 2004 14:31:43 +0000
Subject: Fix if / elif handling bug in HUSH shell

---
 CHANGELOG         | 6 ++++++
 common/hush.c     | 2 +-
 include/version.h | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 7fe7ee28be..3923ca8ed6 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -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:
 ======================================================================
diff --git a/common/hush.c b/common/hush.c
index 4712adcbfc..eeb970cd53 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 e91860f425..90eb79db34 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__ */
-- 
cgit v1.2.1