57 lines
1.9 KiB
Plaintext
57 lines
1.9 KiB
Plaintext
|
BASH PATCH REPORT
|
||
|
|
=================
|
||
|
|
|
||
|
|
Bash-Release: 3.2
|
||
|
|
Patch-ID: bash32-048
|
||
|
|
|
||
|
|
Bug-Reported-by: Steffen Kiess <s-kiess@web.de>
|
||
|
|
Bug-Reference-ID: <1223929957.5383.6.camel@fips>
|
||
|
|
Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2008-10/msg00047.html
|
||
|
|
|
||
|
|
Bug-Description:
|
||
|
|
|
||
|
|
When invoked as `bash -c', bash did not execute an EXIT trap when the last
|
||
|
|
command in the executed list was a command run from the file system.
|
||
|
|
|
||
|
|
Patch:
|
||
|
|
|
||
|
|
*** /Users/chet/src/bash/bash-3.2-patched/builtins/evalstring.c 2006-07-28 15:12:16.000000000 -0400
|
||
|
|
--- builtins/evalstring.c 2008-11-13 18:38:45.000000000 -0500
|
||
|
|
***************
|
||
|
|
*** 249,252 ****
|
||
|
|
--- 249,253 ----
|
||
|
|
* we're not running a trap AND
|
||
|
|
* we have parsed the full command (string == '\0') AND
|
||
|
|
+ * we're not going to run the exit trap AND
|
||
|
|
* we have a simple command without redirections AND
|
||
|
|
* the command is not being timed AND
|
||
|
|
***************
|
||
|
|
*** 259,263 ****
|
||
|
|
*bash_input.location.string == '\0' &&
|
||
|
|
command->type == cm_simple &&
|
||
|
|
! !command->redirects && !command->value.Simple->redirects &&
|
||
|
|
((command->flags & CMD_TIME_PIPELINE) == 0) &&
|
||
|
|
((command->flags & CMD_INVERT_RETURN) == 0))
|
||
|
|
--- 260,265 ----
|
||
|
|
*bash_input.location.string == '\0' &&
|
||
|
|
command->type == cm_simple &&
|
||
|
|
! signal_is_trapped (EXIT_TRAP) == 0 &&
|
||
|
|
! command->redirects == 0 && command->value.Simple->redirects == 0 &&
|
||
|
|
((command->flags & CMD_TIME_PIPELINE) == 0) &&
|
||
|
|
((command->flags & CMD_INVERT_RETURN) == 0))
|
||
|
|
*** ../bash-3.2/patchlevel.h Thu Apr 13 08:31:04 2006
|
||
|
|
--- patchlevel.h Mon Oct 16 14:22:54 2006
|
||
|
|
***************
|
||
|
|
*** 26,30 ****
|
||
|
|
looks for to find the patch level (for the sccs version string). */
|
||
|
|
|
||
|
|
! #define PATCHLEVEL 47
|
||
|
|
|
||
|
|
#endif /* _PATCHLEVEL_H_ */
|
||
|
|
--- 26,30 ----
|
||
|
|
looks for to find the patch level (for the sccs version string). */
|
||
|
|
|
||
|
|
! #define PATCHLEVEL 48
|
||
|
|
|
||
|
|
#endif /* _PATCHLEVEL_H_ */
|