Blame bash-5.1-patch-3.patch
|
Siteshwar Vashisht |
66f2dd |
diff --git a/patchlevel.h b/patchlevel.h
|
|
Siteshwar Vashisht |
66f2dd |
--- a/patchlevel.h
|
|
Siteshwar Vashisht |
66f2dd |
+++ b/patchlevel.h
|
|
Siteshwar Vashisht |
66f2dd |
@@ -25,6 +25,6 @@
|
|
Siteshwar Vashisht |
66f2dd |
regexp `^#define[ ]*PATCHLEVEL', since that's what support/mkversion.sh
|
|
Siteshwar Vashisht |
66f2dd |
looks for to find the patch level (for the sccs version string). */
|
|
Siteshwar Vashisht |
66f2dd |
|
|
Siteshwar Vashisht |
66f2dd |
-#define PATCHLEVEL 2
|
|
Siteshwar Vashisht |
66f2dd |
+#define PATCHLEVEL 3
|
|
Siteshwar Vashisht |
66f2dd |
|
|
Siteshwar Vashisht |
66f2dd |
#endif /* _PATCHLEVEL_H_ */
|
|
Siteshwar Vashisht |
66f2dd |
diff --git a/subst.c b/subst.c
|
|
Siteshwar Vashisht |
66f2dd |
--- a/subst.c
|
|
Siteshwar Vashisht |
66f2dd |
+++ b/subst.c
|
|
Siteshwar Vashisht |
66f2dd |
@@ -6356,8 +6356,10 @@ command_substitute (string, quoted, flags)
|
|
Siteshwar Vashisht |
66f2dd |
|
|
Siteshwar Vashisht |
66f2dd |
#if defined (JOB_CONTROL)
|
|
Siteshwar Vashisht |
66f2dd |
old_pipeline_pgrp = pipeline_pgrp;
|
|
Siteshwar Vashisht |
66f2dd |
- /* Don't reset the pipeline pgrp if we're already a subshell in a pipeline. */
|
|
Siteshwar Vashisht |
66f2dd |
- if ((subshell_environment & SUBSHELL_PIPE) == 0)
|
|
Siteshwar Vashisht |
66f2dd |
+ /* Don't reset the pipeline pgrp if we're already a subshell in a pipeline or
|
|
Siteshwar Vashisht |
66f2dd |
+ we've already forked to run a disk command (and are expanding redirections,
|
|
Siteshwar Vashisht |
66f2dd |
+ for example). */
|
|
Siteshwar Vashisht |
66f2dd |
+ if ((subshell_environment & (SUBSHELL_FORK|SUBSHELL_PIPE)) == 0)
|
|
Siteshwar Vashisht |
66f2dd |
pipeline_pgrp = shell_pgrp;
|
|
Siteshwar Vashisht |
66f2dd |
cleanup_the_pipeline ();
|
|
Siteshwar Vashisht |
66f2dd |
#endif /* JOB_CONTROL */
|