25 lines
892 B
Diff
25 lines
892 B
Diff
|
diff --git a/execute_cmd.c b/execute_cmd.c
|
||
|
|
--- a/execute_cmd.c
|
||
|
|
+++ b/execute_cmd.c
|
||
|
|
@@ -1725,6 +1725,9 @@ execute_in_subshell (command, asynchronous, pipe_in, pipe_out, fds_to_close)
|
||
|
|
return_code = (return_code == EXECUTION_SUCCESS) ? EXECUTION_FAILURE
|
||
|
|
: EXECUTION_SUCCESS;
|
||
|
|
|
||
|
|
+ /* Check for terminating signals before we return to our caller, which we
|
||
|
|
+ expect to exit immediately anyway. */
|
||
|
|
+ CHECK_TERMSIG;
|
||
|
|
|
||
|
|
/* If we were explicitly placed in a subshell with (), we need
|
||
|
|
to do the `shell cleanup' things, such as running traps[0]. */
|
||
|
|
diff --git a/patchlevel.h b/patchlevel.h
|
||
|
|
--- 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). */
|
||
|
|
|
||
|
|
-#define PATCHLEVEL 24
|
||
|
|
+#define PATCHLEVEL 25
|
||
|
|
|
||
|
|
#endif /* _PATCHLEVEL_H_ */
|