]> git.ipfire.org Git - ipfire-2.x.git/blob - src/patches/bash/bash32-048
Merge remote-tracking branch 'origin/next' into thirteen
[ipfire-2.x.git] / src / patches / bash / bash32-048
1 BASH PATCH REPORT
2 =================
3
4 Bash-Release: 3.2
5 Patch-ID: bash32-048
6
7 Bug-Reported-by: Steffen Kiess <s-kiess@web.de>
8 Bug-Reference-ID: <1223929957.5383.6.camel@fips>
9 Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2008-10/msg00047.html
10
11 Bug-Description:
12
13 When invoked as `bash -c', bash did not execute an EXIT trap when the last
14 command in the executed list was a command run from the file system.
15
16 Patch:
17
18 *** /Users/chet/src/bash/bash-3.2-patched/builtins/evalstring.c 2006-07-28 15:12:16.000000000 -0400
19 --- builtins/evalstring.c 2008-11-13 18:38:45.000000000 -0500
20 ***************
21 *** 249,252 ****
22 --- 249,253 ----
23 * we're not running a trap AND
24 * we have parsed the full command (string == '\0') AND
25 + * we're not going to run the exit trap AND
26 * we have a simple command without redirections AND
27 * the command is not being timed AND
28 ***************
29 *** 259,263 ****
30 *bash_input.location.string == '\0' &&
31 command->type == cm_simple &&
32 ! !command->redirects && !command->value.Simple->redirects &&
33 ((command->flags & CMD_TIME_PIPELINE) == 0) &&
34 ((command->flags & CMD_INVERT_RETURN) == 0))
35 --- 260,265 ----
36 *bash_input.location.string == '\0' &&
37 command->type == cm_simple &&
38 ! signal_is_trapped (EXIT_TRAP) == 0 &&
39 ! command->redirects == 0 && command->value.Simple->redirects == 0 &&
40 ((command->flags & CMD_TIME_PIPELINE) == 0) &&
41 ((command->flags & CMD_INVERT_RETURN) == 0))
42 *** ../bash-3.2/patchlevel.h Thu Apr 13 08:31:04 2006
43 --- patchlevel.h Mon Oct 16 14:22:54 2006
44 ***************
45 *** 26,30 ****
46 looks for to find the patch level (for the sccs version string). */
47
48 ! #define PATCHLEVEL 47
49
50 #endif /* _PATCHLEVEL_H_ */
51 --- 26,30 ----
52 looks for to find the patch level (for the sccs version string). */
53
54 ! #define PATCHLEVEL 48
55
56 #endif /* _PATCHLEVEL_H_ */