dmbcs/i-bash
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Bash-4.4 patch 4

Browse source
This commit is contained in:
Chet Ramey 2016-11-14 14:27:35 -05:00
commit 2965eca924
4 changed files with 18 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

15
jobs.c
View file

@ -453,6 +453,21 @@ cleanup_the_pipeline ()
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 *
alloc_pipeline_saver ()
{

1
jobs.h
View file

@ -190,6 +190,7 @@ extern JOB **jobs;
extern void making_children __P((void));
extern void stop_making_children __P((void));
extern void cleanup_the_pipeline __P((void));
extern void discard_last_procsub_child __P((void));
extern void save_pipeline __P((int));
extern PROCESS *restore_pipeline __P((int));
extern void start_pipeline __P((void));

2
patchlevel.h
View file

@ -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 3
#define PATCHLEVEL 4
#endif /* _PATCHLEVEL_H_ */

5
subst.c
View file

@ -5808,10 +5808,7 @@ process_substitute (string, open_for_read_in_child)
{
#if defined (JOB_CONTROL)
if (last_procsub_child)
{
discard_pipeline (last_procsub_child);
last_procsub_child = (PROCESS *)NULL;
}
discard_last_procsub_child ();
last_procsub_child = restore_pipeline (0);
#endif