]> git.ipfire.org Git - people/pmueller/ipfire-2.x.git/blob - src/patches/bash/bash32-045
Merge remote-tracking branch 'stevee/mc-update' into thirteen
[people/pmueller/ipfire-2.x.git] / src / patches / bash / bash32-045
1 BASH PATCH REPORT
2 =================
3
4 Bash-Release: 3.2
5 Patch-ID: bash32-045
6
7 Bug-Reported-by: Roman Rakus <rrakus@redhat.com>
8 Bug-Reference-ID: <4864B4A0.1060402@redhat.com>
9 Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2008-06/msg00098.html
10
11 Bug-Description:
12
13 When short-circuiting execution due to the `break' or `continue' builtins,
14 bash did not preserve the value of $?.
15
16 Patch:
17
18 *** ../bash-3.2-patched/execute_cmd.c 2008-04-28 22:00:24.000000000 -0400
19 --- execute_cmd.c 2008-10-18 14:35:03.000000000 -0400
20 ***************
21 *** 502,507 ****
22 --- 514,526 ----
23 volatile int save_line_number;
24
25 + #if 0
26 if (command == 0 || breaking || continuing || read_but_dont_execute)
27 return (EXECUTION_SUCCESS);
28 + #else
29 + if (breaking || continuing)
30 + return (last_command_exit_value);
31 + if (command == 0 || read_but_dont_execute)
32 + return (EXECUTION_SUCCESS);
33 + #endif
34
35 QUIT;
36 *** ../bash-3.2/patchlevel.h Thu Apr 13 08:31:04 2006
37 --- patchlevel.h Mon Oct 16 14:22:54 2006
38 ***************
39 *** 26,30 ****
40 looks for to find the patch level (for the sccs version string). */
41
42 ! #define PATCHLEVEL 44
43
44 #endif /* _PATCHLEVEL_H_ */
45 --- 26,30 ----
46 looks for to find the patch level (for the sccs version string). */
47
48 ! #define PATCHLEVEL 45
49
50 #endif /* _PATCHLEVEL_H_ */