From aa85564319f4d511fae04a3cdf7a0b1fba1f67fe Mon Sep 17 00:00:00 2001
From: Bart Schaefer <schaefer@zsh.org>
Date: Wed, 26 Jul 2023 19:54:30 -0700
Subject: [PATCH] 51969: read -d and -s should not reset terminal state when
 stdin is redirected

---
 ChangeLog     | 3 +++
 Src/builtin.c | 6 +++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 74496543f..a02e25218 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2023-07-26  Bart Schaefer  <schaefer@zsh.org>
 
+	* 51969: Src/builtin.c: read -d and -s should not reset terminal
+	state when stdin is redirected
+
 	* 51949 (tweak per 51950): Src/Zle/zle_main.c: correct Thingy
 	refcount in raw_getbyte()
 
diff --git a/Src/builtin.c b/Src/builtin.c
index 669a47092..1568cf44c 100644
--- a/Src/builtin.c
+++ b/Src/builtin.c
@@ -6483,7 +6483,7 @@ bin_read(char *name, char **args, Options ops, UNUSED(int func))
     } else
 	readfd = izle = 0;
 
-    if (OPT_ISSET(ops,'s') && SHTTY != -1) {
+    if (OPT_ISSET(ops,'s') && SHTTY == readfd) {
 	struct ttyinfo ti;
 	gettyinfo(&ti);
 	saveti = ti;
@@ -6531,7 +6531,7 @@ bin_read(char *name, char **args, Options ops, UNUSED(int func))
         delim = (unsigned char) ((delimstr[0] == Meta) ?
 			delimstr[1] ^ 32 : delimstr[0]);
 #endif
-	if (SHTTY != -1) {
+	if (SHTTY == readfd) {
 	    struct ttyinfo ti;
 	    gettyinfo(&ti);
 	    if (! resettty) {
@@ -6691,7 +6691,7 @@ bin_read(char *name, char **args, Options ops, UNUSED(int func))
 	    /* dispose of result appropriately, etc. */
 	    if (isem)
 		while (val > 0 && read(SHTTY, &d, 1) == 1 && d != '\n');
-	    else {
+	    else if (resettty) {
 		settyinfo(&shttyinfo);
 		resettty = 0;
 	    }