Blame bash-4.4-patch-11.patch
|
Siteshwar Vashisht |
ed01fa |
From 76bb456d8fcd870cd31b7bf9d90798cd97cee2ab Mon Sep 17 00:00:00 2001
|
|
Siteshwar Vashisht |
ed01fa |
From: Chet Ramey <chet.ramey@case.edu>
|
|
Siteshwar Vashisht |
ed01fa |
Date: Fri, 20 Jan 2017 15:38:49 -0500
|
|
Siteshwar Vashisht |
ed01fa |
Subject: [PATCH] Bash-4.4 patch 11
|
|
Siteshwar Vashisht |
ed01fa |
|
|
Siteshwar Vashisht |
ed01fa |
---
|
|
Siteshwar Vashisht |
ed01fa |
patchlevel.h | 2 +-
|
|
Siteshwar Vashisht |
ed01fa |
sig.c | 3 ++-
|
|
Siteshwar Vashisht |
ed01fa |
2 files changed, 3 insertions(+), 2 deletions(-)
|
|
Siteshwar Vashisht |
ed01fa |
|
|
Siteshwar Vashisht |
ed01fa |
diff --git a/patchlevel.h b/patchlevel.h
|
|
Siteshwar Vashisht |
ed01fa |
index 8002af7..772676c 100644
|
|
Siteshwar Vashisht |
ed01fa |
--- a/patchlevel.h
|
|
Siteshwar Vashisht |
ed01fa |
+++ b/patchlevel.h
|
|
Siteshwar Vashisht |
ed01fa |
@@ -25,6 +25,6 @@
|
|
Siteshwar Vashisht |
ed01fa |
regexp `^#define[ ]*PATCHLEVEL', since that's what support/mkversion.sh
|
|
Siteshwar Vashisht |
ed01fa |
looks for to find the patch level (for the sccs version string). */
|
|
Siteshwar Vashisht |
ed01fa |
|
|
Siteshwar Vashisht |
ed01fa |
-#define PATCHLEVEL 10
|
|
Siteshwar Vashisht |
ed01fa |
+#define PATCHLEVEL 11
|
|
Siteshwar Vashisht |
ed01fa |
|
|
Siteshwar Vashisht |
ed01fa |
#endif /* _PATCHLEVEL_H_ */
|
|
Siteshwar Vashisht |
ed01fa |
diff --git a/sig.c b/sig.c
|
|
Siteshwar Vashisht |
ed01fa |
index ad01631..e5bb739 100644
|
|
Siteshwar Vashisht |
ed01fa |
--- a/sig.c
|
|
Siteshwar Vashisht |
ed01fa |
+++ b/sig.c
|
|
Siteshwar Vashisht |
ed01fa |
@@ -585,7 +585,8 @@ termsig_handler (sig)
|
|
Siteshwar Vashisht |
ed01fa |
#if defined (JOB_CONTROL)
|
|
Siteshwar Vashisht |
ed01fa |
if (sig == SIGHUP && (interactive || (subshell_environment & (SUBSHELL_COMSUB|SUBSHELL_PROCSUB))))
|
|
Siteshwar Vashisht |
ed01fa |
hangup_all_jobs ();
|
|
Siteshwar Vashisht |
ed01fa |
- end_job_control ();
|
|
Siteshwar Vashisht |
ed01fa |
+ if ((subshell_environment & (SUBSHELL_COMSUB|SUBSHELL_PROCSUB)) == 0)
|
|
Siteshwar Vashisht |
ed01fa |
+ end_job_control ();
|
|
Siteshwar Vashisht |
ed01fa |
#endif /* JOB_CONTROL */
|
|
Siteshwar Vashisht |
ed01fa |
|
|
Siteshwar Vashisht |
ed01fa |
#if defined (PROCESS_SUBSTITUTION)
|
|
Siteshwar Vashisht |
ed01fa |
--
|
|
Siteshwar Vashisht |
ed01fa |
2.9.3
|
|
Siteshwar Vashisht |
ed01fa |
|