projects
/
platform
/
upstream
/
bash.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
f5c8237
)
Bash-4.3 patch 2
author
Chet Ramey
<chet.ramey@case.edu>
Fri, 28 Mar 2014 15:53:02 +0000
(11:53 -0400)
committer
Chet Ramey
<chet.ramey@case.edu>
Fri, 28 Mar 2014 15:53:02 +0000
(11:53 -0400)
patchlevel.h
patch
|
blob
|
history
trap.c
patch
|
blob
|
history
diff --git
a/patchlevel.h
b/patchlevel.h
index
15f3c51
..
1146585
100644
(file)
--- 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). */
regexp `^#define[ ]*PATCHLEVEL', since that's what support/mkversion.sh
looks for to find the patch level (for the sccs version string). */
-#define PATCHLEVEL
1
+#define PATCHLEVEL
2
#endif /* _PATCHLEVEL_H_ */
#endif /* _PATCHLEVEL_H_ */
diff --git
a/trap.c
b/trap.c
index
15d3fc8
..
edce31a
100644
(file)
--- a/
trap.c
+++ b/
trap.c
@@
-920,7
+920,8
@@
_run_trap_internal (sig, tag)
subst_assign_varlist = 0;
#if defined (JOB_CONTROL)
subst_assign_varlist = 0;
#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
/* If we're in a function, make sure return longjmps come here, too. */
#endif
/* 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;
#if defined (JOB_CONTROL)
trap_exit_value = last_command_exit_value;
#if defined (JOB_CONTROL)
- restore_pipeline (1);
+ if (sig != DEBUG_TRAP) /* run_debug_trap does this */
+ restore_pipeline (1);
#endif
subst_assign_varlist = save_subst_varlist;
#endif
subst_assign_varlist = save_subst_varlist;