From 35ddd9c4bae1956932dc45b4af48391ac71da0a2 Mon Sep 17 00:00:00 2001
From: Peter Stephenson <pws@users.sourceforge.net>
Date: Mon, 11 Apr 2011 16:34:21 +0000
Subject: users/15953: handle EINTR when using read -k or -q with -u or -p

---
 Src/builtin.c | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

(limited to 'Src/builtin.c')

diff --git a/Src/builtin.c b/Src/builtin.c
index cda5e68cb..127d58bdb 100644
--- a/Src/builtin.c
+++ b/Src/builtin.c
@@ -5291,9 +5291,16 @@ bin_read(char *name, char **args, Options ops, UNUSED(int func))
 		    *bptr = readchar;
 		    val = 1;
 		    readchar = -1;
-		} else if ((val = read(readfd, bptr, nchars)) <= 0) {
-		    eof = 1;
-		    break;
+		} else {
+		    while ((val = read(readfd, bptr, nchars)) < 0) {
+			if (errno != EINTR ||
+			    errflag || retflag || breaks || contflag)
+			    break;
+		    }
+		    if (val <= 0) {
+			eof = 1;
+			break;
+		    }
 		}
 
 #ifdef MULTIBYTE_SUPPORT
-- 
cgit 1.4.1