| author | Lukas Rovensky <Lukas.Rovensky@oracle.com> |
| Thu, 26 Nov 2015 08:04:44 -0800 | |
| branch | s11u3-sru |
| changeset 5139 | efbc4023ba66 |
| child 5271 | 195e24ffa71a |
| permissions | -rw-r--r-- |
|
5139
efbc4023ba66
22124201 TCSH Latest Patch 126630-03 changes the behavior of Exit . You cannot exit .
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents:
diff
changeset
|
1 |
Developed in-house but accepted upstream. |
|
efbc4023ba66
22124201 TCSH Latest Patch 126630-03 changes the behavior of Exit . You cannot exit .
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents:
diff
changeset
|
2 |
|
|
efbc4023ba66
22124201 TCSH Latest Patch 126630-03 changes the behavior of Exit . You cannot exit .
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents:
diff
changeset
|
3 |
--- tcsh-6.18.01/sh.sem.c.orig Sat Oct 31 10:58:21 2015 |
|
efbc4023ba66
22124201 TCSH Latest Patch 126630-03 changes the behavior of Exit . You cannot exit .
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents:
diff
changeset
|
4 |
+++ tcsh-6.18.01/sh.sem.c Sat Oct 31 10:59:42 2015 |
|
efbc4023ba66
22124201 TCSH Latest Patch 126630-03 changes the behavior of Exit . You cannot exit .
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents:
diff
changeset
|
5 |
@@ -212,8 +212,14 @@ |
|
efbc4023ba66
22124201 TCSH Latest Patch 126630-03 changes the behavior of Exit . You cannot exit .
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents:
diff
changeset
|
6 |
* If noexec then this is all we do. |
|
efbc4023ba66
22124201 TCSH Latest Patch 126630-03 changes the behavior of Exit . You cannot exit .
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents:
diff
changeset
|
7 |
*/ |
|
efbc4023ba66
22124201 TCSH Latest Patch 126630-03 changes the behavior of Exit . You cannot exit .
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents:
diff
changeset
|
8 |
if (t->t_dflg & F_READ) {
|
|
efbc4023ba66
22124201 TCSH Latest Patch 126630-03 changes the behavior of Exit . You cannot exit .
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents:
diff
changeset
|
9 |
+ int old_pintr_disabled; |
|
efbc4023ba66
22124201 TCSH Latest Patch 126630-03 changes the behavior of Exit . You cannot exit .
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents:
diff
changeset
|
10 |
+ |
|
efbc4023ba66
22124201 TCSH Latest Patch 126630-03 changes the behavior of Exit . You cannot exit .
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents:
diff
changeset
|
11 |
xclose(0); |
|
efbc4023ba66
22124201 TCSH Latest Patch 126630-03 changes the behavior of Exit . You cannot exit .
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents:
diff
changeset
|
12 |
+ if (setintr) |
|
efbc4023ba66
22124201 TCSH Latest Patch 126630-03 changes the behavior of Exit . You cannot exit .
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents:
diff
changeset
|
13 |
+ pintr_push_enable(&old_pintr_disabled); |
|
efbc4023ba66
22124201 TCSH Latest Patch 126630-03 changes the behavior of Exit . You cannot exit .
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents:
diff
changeset
|
14 |
heredoc(t->t_dlef); |
|
efbc4023ba66
22124201 TCSH Latest Patch 126630-03 changes the behavior of Exit . You cannot exit .
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents:
diff
changeset
|
15 |
+ if (setintr) |
|
efbc4023ba66
22124201 TCSH Latest Patch 126630-03 changes the behavior of Exit . You cannot exit .
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents:
diff
changeset
|
16 |
+ cleanup_until(&old_pintr_disabled); |
|
efbc4023ba66
22124201 TCSH Latest Patch 126630-03 changes the behavior of Exit . You cannot exit .
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents:
diff
changeset
|
17 |
if (noexec) |
|
efbc4023ba66
22124201 TCSH Latest Patch 126630-03 changes the behavior of Exit . You cannot exit .
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents:
diff
changeset
|
18 |
xclose(0); |
|
efbc4023ba66
22124201 TCSH Latest Patch 126630-03 changes the behavior of Exit . You cannot exit .
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents:
diff
changeset
|
19 |
} |