components/tcsh/patches/007.heredoc.patch
author Tomas Kuthan <tomas.kuthan@oracle.com>
Wed, 20 Apr 2016 13:13:57 -0700
changeset 5820 cef0da89f9ee
parent 5271 195e24ffa71a
permissions -rw-r--r--
PSARC/2016/216 OpenSSH 7.2p2 upgrade. Host keys and moduli updates 23030875 network/ssh SMF method: generate correct host key types
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
5040
6242a3f0012d 22124201 TCSH Latest Patch 126630-03 changes the behavior of Exit . You cannot exit .
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset
     1
Developed in-house but accepted upstream.
6242a3f0012d 22124201 TCSH Latest Patch 126630-03 changes the behavior of Exit . You cannot exit .
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset
     2
5271
195e24ffa71a 22527103 update tcsh to 6.19.00
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 5040
diff changeset
     3
--- tcsh-6.19.00/sh.sem.c.orig	Sat Oct 31 10:58:21 2015
195e24ffa71a 22527103 update tcsh to 6.19.00
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 5040
diff changeset
     4
+++ tcsh-6.19.00/sh.sem.c	Sat Oct 31 10:59:42 2015
5040
6242a3f0012d 22124201 TCSH Latest Patch 126630-03 changes the behavior of Exit . You cannot exit .
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset
     5
@@ -212,8 +212,14 @@
6242a3f0012d 22124201 TCSH Latest Patch 126630-03 changes the behavior of Exit . You cannot exit .
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset
     6
 	 * If noexec then this is all we do.
6242a3f0012d 22124201 TCSH Latest Patch 126630-03 changes the behavior of Exit . You cannot exit .
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset
     7
 	 */
6242a3f0012d 22124201 TCSH Latest Patch 126630-03 changes the behavior of Exit . You cannot exit .
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset
     8
 	if (t->t_dflg & F_READ) {
6242a3f0012d 22124201 TCSH Latest Patch 126630-03 changes the behavior of Exit . You cannot exit .
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset
     9
+	    int	old_pintr_disabled;
6242a3f0012d 22124201 TCSH Latest Patch 126630-03 changes the behavior of Exit . You cannot exit .
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset
    10
+	    
6242a3f0012d 22124201 TCSH Latest Patch 126630-03 changes the behavior of Exit . You cannot exit .
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset
    11
 	    xclose(0);
6242a3f0012d 22124201 TCSH Latest Patch 126630-03 changes the behavior of Exit . You cannot exit .
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset
    12
+	    if (setintr)
6242a3f0012d 22124201 TCSH Latest Patch 126630-03 changes the behavior of Exit . You cannot exit .
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset
    13
+	        pintr_push_enable(&old_pintr_disabled);
6242a3f0012d 22124201 TCSH Latest Patch 126630-03 changes the behavior of Exit . You cannot exit .
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset
    14
 	    heredoc(t->t_dlef);
6242a3f0012d 22124201 TCSH Latest Patch 126630-03 changes the behavior of Exit . You cannot exit .
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset
    15
+	    if (setintr)
6242a3f0012d 22124201 TCSH Latest Patch 126630-03 changes the behavior of Exit . You cannot exit .
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset
    16
+	        cleanup_until(&old_pintr_disabled);
6242a3f0012d 22124201 TCSH Latest Patch 126630-03 changes the behavior of Exit . You cannot exit .
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset
    17
 	    if (noexec)
6242a3f0012d 22124201 TCSH Latest Patch 126630-03 changes the behavior of Exit . You cannot exit .
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset
    18
 		xclose(0);
6242a3f0012d 22124201 TCSH Latest Patch 126630-03 changes the behavior of Exit . You cannot exit .
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset
    19
 	}