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

Bash-4.3 patch 2

Browse source
This commit is contained in:
Chet Ramey 2014-03-28 11:53:02 -04:00
commit 7f89f4cd13
2 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
patchlevel.h
View file

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

6
trap.c
View file

@ -920,7 +920,8 @@ _run_trap_internal (sig, tag)
subst_assign_varlist = 0; subst_assign_varlist = 0;
#if defined (JOB_CONTROL) #if defined (JOB_CONTROL)
save_pipeline (1); /* XXX only provides one save level */ if (sig != DEBUG_TRAP) /* run_debug_trap does this */
save_pipeline (1); /* XXX only provides one save level */
#endif #endif
/* If we're in a function, make sure return longjmps come here, too. */ /* If we're in a function, make sure return longjmps come here, too. */
@ -940,7 +941,8 @@ _run_trap_internal (sig, tag)
trap_exit_value = last_command_exit_value; trap_exit_value = last_command_exit_value;
#if defined (JOB_CONTROL) #if defined (JOB_CONTROL)
restore_pipeline (1); if (sig != DEBUG_TRAP) /* run_debug_trap does this */
restore_pipeline (1);
#endif #endif
subst_assign_varlist = save_subst_varlist; subst_assign_varlist = save_subst_varlist;