1 files changed, 7 insertions, 0 deletions
diff --git a/shell/hush.c b/shell/hush.c
index d5ea3b21f..3a4b5d894 100644
--- a/shell/hush.c
+++ b/shell/hush.c
@@ -9394,6 +9394,13 @@ int hush_main(int argc, char **argv)
                        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;
                }
                case 'R':

diff --git a/shell/hush.c b/shell/hush.c index d5ea3b21f..3a4b5d894 100644 --- a/shell/hush.c +++ b/shell/hush.c
@@ -9394,6 +9394,13 @@ int hush_main(int argc, char **argv)
9394	optarg++;	9394	optarg++;
9395	G.depth_of_loop = bb_strtou(optarg, &optarg, 16);	9395	G.depth_of_loop = bb_strtou(optarg, &optarg, 16);
9396	# endif	9396	# endif
		9397	# if ENABLE_HUSH_FUNCTIONS
		9398	/* nommu uses re-exec trick for "... \| func \| ...",
		9399	* should allow "return".
		9400	* This accidentally allows returns in subshells.
		9401	*/
		9402	G_flag_return_in_progress = -1;
		9403	# endif
9397	break;	9404	break;
9398	}	9405	}
9399	case 'R':	9406	case 'R':