Bash-4.4 patch 4
This commit is contained in:
15
jobs.c
15
jobs.c
@@ -453,6 +453,21 @@ cleanup_the_pipeline ()
|
|||||||
discard_pipeline (disposer);
|
discard_pipeline (disposer);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
discard_last_procsub_child ()
|
||||||
|
{
|
||||||
|
PROCESS *disposer;
|
||||||
|
sigset_t set, oset;
|
||||||
|
|
||||||
|
BLOCK_CHILD (set, oset);
|
||||||
|
disposer = last_procsub_child;
|
||||||
|
last_procsub_child = (PROCESS *)NULL;
|
||||||
|
UNBLOCK_CHILD (oset);
|
||||||
|
|
||||||
|
if (disposer)
|
||||||
|
discard_pipeline (disposer);
|
||||||
|
}
|
||||||
|
|
||||||
struct pipeline_saver *
|
struct pipeline_saver *
|
||||||
alloc_pipeline_saver ()
|
alloc_pipeline_saver ()
|
||||||
{
|
{
|
||||||
|
|||||||
1
jobs.h
1
jobs.h
@@ -190,6 +190,7 @@ extern JOB **jobs;
|
|||||||
extern void making_children __P((void));
|
extern void making_children __P((void));
|
||||||
extern void stop_making_children __P((void));
|
extern void stop_making_children __P((void));
|
||||||
extern void cleanup_the_pipeline __P((void));
|
extern void cleanup_the_pipeline __P((void));
|
||||||
|
extern void discard_last_procsub_child __P((void));
|
||||||
extern void save_pipeline __P((int));
|
extern void save_pipeline __P((int));
|
||||||
extern PROCESS *restore_pipeline __P((int));
|
extern PROCESS *restore_pipeline __P((int));
|
||||||
extern void start_pipeline __P((void));
|
extern void start_pipeline __P((void));
|
||||||
|
|||||||
@@ -25,6 +25,6 @@
|
|||||||
regexp `^#define[ ]*PATCHLEVEL', since that's what support/mkversion.sh
|
regexp `^#define[ ]*PATCHLEVEL', since that's what support/mkversion.sh
|
||||||
looks for to find the patch level (for the sccs version string). */
|
looks for to find the patch level (for the sccs version string). */
|
||||||
|
|
||||||
#define PATCHLEVEL 3
|
#define PATCHLEVEL 4
|
||||||
|
|
||||||
#endif /* _PATCHLEVEL_H_ */
|
#endif /* _PATCHLEVEL_H_ */
|
||||||
|
|||||||
5
subst.c
5
subst.c
@@ -5808,10 +5808,7 @@ process_substitute (string, open_for_read_in_child)
|
|||||||
{
|
{
|
||||||
#if defined (JOB_CONTROL)
|
#if defined (JOB_CONTROL)
|
||||||
if (last_procsub_child)
|
if (last_procsub_child)
|
||||||
{
|
discard_last_procsub_child ();
|
||||||
discard_pipeline (last_procsub_child);
|
|
||||||
last_procsub_child = (PROCESS *)NULL;
|
|
||||||
}
|
|
||||||
last_procsub_child = restore_pipeline (0);
|
last_procsub_child = restore_pipeline (0);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user