From a1d396cced8452d89c875c3d56b04e6c2dadb712 Mon Sep 17 00:00:00 2001
From: David Kaspar [Dee'Kej] <dkaspar@redhat.com>
Date: May 03 2016 14:08:25 +0000
Subject: tcsh-6.19.00-020-make-heredoc-interruptible-again.patch added


  > Make heredoc interruptible again (Mike Sullivan)

---

diff --git a/tcsh-6.19.00-020-make-heredoc-interruptible-again.patch b/tcsh-6.19.00-020-make-heredoc-interruptible-again.patch
new file mode 100644
index 0000000..f775b2b
--- /dev/null
+++ b/tcsh-6.19.00-020-make-heredoc-interruptible-again.patch
@@ -0,0 +1,43 @@
+From 4fc4702ec7b1e46dc620644305a9ac19250f9722 Mon Sep 17 00:00:00 2001
+From: christos <christos>
+Date: Sat, 31 Oct 2015 18:54:42 +0000
+Subject: [PATCH] Make heredoc interruptible again (Mike Sullivan)
+
+---
+ bar      | 4 ----
+ sh.sem.c | 6 ++++++
+ 2 files changed, 6 insertions(+), 4 deletions(-)
+ delete mode 100644 bar
+
+diff --git a/bar b/bar
+deleted file mode 100644
+index 3305e7d..0000000
+--- a/bar
++++ /dev/null
+@@ -1,4 +0,0 @@
+-
+-
+-
+-i
+diff --git a/sh.sem.c b/sh.sem.c
+index 4293b1b..a904c6e 100644
+--- a/sh.sem.c
++++ b/sh.sem.c
+@@ -212,8 +212,14 @@ execute(struct command *t, volatile int wanttty, int *pipein, int *pipeout,
+ 	 * If noexec then this is all we do.
+ 	 */
+ 	if (t->t_dflg & F_READ) {
++	    int old_pintr_disabled;
++
+ 	    xclose(0);
++	    if (setintr)
++		pintr_push_enable(&old_pintr_disabled);
+ 	    heredoc(t->t_dlef);
++	    if (setintr)
++		cleanup_until(&old_pintr_disabled);
+ 	    if (noexec)
+ 		xclose(0);
+ 	}
+-- 
+2.5.5
+
diff --git a/tcsh.spec b/tcsh.spec
index 6678afa..7e2fcdc 100644
--- a/tcsh.spec
+++ b/tcsh.spec
@@ -48,6 +48,7 @@ Patch016: tcsh-6.19.00-016-do-not-quote-name-expanded-by-completion.patch
 Patch017: tcsh-6.19.00-017-fix-for-finnish-translations.patch
 Patch018: tcsh-6.19.00-018-add-noclobber-and-ask-options.patch
 Patch019: tcsh-6.19.00-019-fix-uninitialized-estr.patch
+Patch020: tcsh-6.19.00-020-make-heredoc-interruptible-again.patch
 
 
 # Downstream patches -- these should be always included when doing rebase:
@@ -188,6 +189,7 @@ fi
     tcsh-6.19.00-017-fix-for-finnish-translations.patch
     tcsh-6.19.00-018-add-noclobber-and-ask-options.patch
     tcsh-6.19.00-019-fix-uninitialized-estr.patch
+    tcsh-6.19.00-020-make-heredoc-interruptible-again.patch
 
 * Thu Apr 21 2016 David Kaspar [Dee'Kej] <dkaspar@redhat.com> - 6.19.00-6
 - Drop tcsh-6.15.00-closem.patch - issue not reproducible, patch not accepted by upstream