-
Notifications
You must be signed in to change notification settings - Fork 0
Expand file tree
/
Copy pathbash-5.2-patch-28.patch
More file actions
25 lines (22 loc) · 900 Bytes
/
bash-5.2-patch-28.patch
File metadata and controls
25 lines (22 loc) · 900 Bytes
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
diff --git a/patchlevel.h b/patchlevel.h
--- a/patchlevel.h
+++ b/patchlevel.h
@@ -25,6 +25,6 @@
regexp `^#define[ ]*PATCHLEVEL', since that's what support/mkversion.sh
looks for to find the patch level (for the sccs version string). */
-#define PATCHLEVEL 27
+#define PATCHLEVEL 28
#endif /* _PATCHLEVEL_H_ */
diff --git a/trap.c b/trap.c
--- a/trap.c
+++ b/trap.c
@@ -1216,7 +1216,9 @@ run_debug_trap ()
close_pgrp_pipe ();
restore_pgrp_pipe (save_pipe);
# endif
- if (pipeline_pgrp > 0 && ((subshell_environment & (SUBSHELL_ASYNC|SUBSHELL_PIPE)) == 0))
+ /* If the trap command gave the terminal to another process group,
+ restore it. XXX - check running_in_background? */
+ if (job_control && pipeline_pgrp > 0 && ((subshell_environment & (SUBSHELL_ASYNC|SUBSHELL_PIPE)) == 0))
give_terminal_to (pipeline_pgrp, 1);
notify_and_cleanup ();