From e44e3d50dee26d12927baca188ad2a44a0135173 Mon Sep 17 00:00:00 2001
From: Chet Ramey <chet.ramey@case.edu>
Date: Mon, 15 May 2023 13:30:18 -0400
Subject: complete initial implementation of nofork command substitution (${
 command; })

---
 builtins/evalstring.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'builtins/evalstring.c')

diff --git a/builtins/evalstring.c b/builtins/evalstring.c
index d5c13a51..1b00da2e 100644
--- a/builtins/evalstring.c
+++ b/builtins/evalstring.c
@@ -531,7 +531,7 @@ parse_and_execute (char *string, const char *from_file, int flags)
 		 the global value of the flag (expaliases_flag) changes). */
 	      local_expalias = expand_aliases;
 	      local_alflag = expaliases_flag;
-	      if (subshell_environment & SUBSHELL_COMSUB)
+	      if ((subshell_environment & SUBSHELL_COMSUB) || executing_funsub)
 		expand_aliases = expaliases_flag;
 
 	      /* See if this is a candidate for $( <file ). */
@@ -552,7 +552,7 @@ parse_and_execute (char *string, const char *from_file, int flags)
 	      discard_unwind_frame ("pe_dispose");
 
 	      /* If the global value didn't change, we restore what we had. */
-	      if ((subshell_environment & SUBSHELL_COMSUB) && local_alflag == expaliases_flag)
+	      if (((subshell_environment & SUBSHELL_COMSUB) || executing_funsub) && local_alflag == expaliases_flag)
 		expand_aliases = local_expalias;
 
 	      if (flags & SEVAL_ONECMD)
-- 
cgit v1.2.1