From 7444fc7c246c5de4689aaed6b45275a18d7abe54 Mon Sep 17 00:00:00 2001
From: Martijn Dekker <martijn@inlv.org>
Date: Tue, 22 Sep 2020 14:39:28 +0200
Subject: [PATCH] better v=$(<file) fix (re: fe6d0903)

If we're adding a check for flag==3 to limit the fix to v=$(<file),
we might as well use the existing check upon returning the FD.
---
 src/cmd/ksh93/sh/io.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/cmd/ksh93/sh/io.c b/src/cmd/ksh93/sh/io.c
index b3e18171e39d..4083864d95cb 100644
--- a/src/cmd/ksh93/sh/io.c
+++ b/src/cmd/ksh93/sh/io.c
@@ -1266,8 +1266,6 @@ int	sh_redirect(Shell_t *shp,struct ionod *iop, int flag)
 				if(flag==SH_SHOWME)
 					goto traceit;
 				fd=sh_chkopen(fname);
-				if(flag==3)			/* make sure that $(<file) works...	*/
-					fd=sh_iomovefd(fd);	/* ...with stdin/stdout/stderr closed	*/
 			}
 			else if(sh_isoption(SH_RESTRICTED))
 				errormsg(SH_DICT,ERROR_exit(1),e_restricted,fname);
@@ -1447,7 +1445,7 @@ int	sh_redirect(Shell_t *shp,struct ionod *iop, int flag)
 				sh_close(fn);
 			}
 			if(flag==3)
-				return(fd);
+				return(sh_iomovefd(fd));  /* ensure FD > 2 to make $(<file) work with std{in,out,err} closed */
 			if(fd>=0)
 			{
 				if(np)