From eb0de05d682b28fcf7465358ea31cf8574c1221b Mon Sep 17 00:00:00 2001
From: Denys Vlasenko <vda.linux@googlemail.com>
Date: Mon, 9 Apr 2018 17:54:07 +0200
Subject: [PATCH] hush: fix func_return2.tests on NOMMU

function                                             old     new   delta
hush_main                                           1714    1718      +4

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
---
 shell/hush.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/shell/hush.c b/shell/hush.c
index d5ea3b21f..3a4b5d894 100644
--- a/shell/hush.c
+++ b/shell/hush.c
@@ -9393,6 +9393,13 @@ int hush_main(int argc, char **argv)
 # if ENABLE_HUSH_LOOPS
 			optarg++;
 			G.depth_of_loop = bb_strtou(optarg, &optarg, 16);
+# endif
+# if ENABLE_HUSH_FUNCTIONS
+			/* nommu uses re-exec trick for "... | func | ...",
+			 * should allow "return".
+			 * This accidentally allows returns in subshells.
+			 */
+			G_flag_return_in_progress = -1;
 # endif
 			break;
 		}
-- 
2.25.1