]>
Commit | Line | Data |
---|---|---|
39cb2ba7 AM |
1 | BASH PATCH REPORT |
2 | ================= | |
3 | ||
4 | Bash-Release: 4.0 | |
5 | Patch-ID: bash40-010 | |
6 | ||
7 | Bug-Reported-by: Mike Frysinger <vapier@gentoo.org> | |
8 | Bug-Reference-ID: <200903030122.56206.vapier@gentoo.org> | |
9 | Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2009-03/msg00023.html | |
10 | ||
11 | Bug-Description: | |
12 | ||
13 | Bash has problems parsing comments in case statements when they appear in | |
14 | $(...) subshells. | |
15 | ||
16 | Patch: | |
17 | ||
18 | *** ../bash-4.0/parse.y 2009-03-07 15:18:35.000000000 -0500 | |
19 | --- parse.y 2009-03-07 14:16:32.000000000 -0500 | |
20 | *************** | |
21 | *** 3413,3419 **** | |
22 | tflags &= ~LEX_RESWDOK; | |
23 | } | |
24 | ! else if (shellbreak (ch) == 0) | |
25 | { | |
26 | ! tflags &= ~LEX_RESWDOK; | |
27 | /*itrace("parse_comsub:%d: found `%c', lex_reswordok -> 0", line_number, ch);*/ | |
28 | } | |
29 | --- 3415,3433 ---- | |
30 | tflags &= ~LEX_RESWDOK; | |
31 | } | |
32 | ! else if MBTEST((tflags & LEX_CKCOMMENT) && ch == '#' && (lex_rwlen == 0 || ((tflags & LEX_INWORD) && lex_wlen == 0))) | |
33 | ! ; /* don't modify LEX_RESWDOK if we're starting a comment */ | |
34 | ! else if MBTEST((tflags & LEX_INCASE) && ch != '\n') | |
35 | ! /* If we can read a reserved word and we're in case, we're at the | |
36 | ! point where we can read a new pattern list or an esac. We | |
37 | ! handle the esac case above. If we read a newline, we want to | |
38 | ! leave LEX_RESWDOK alone. If we read anything else, we want to | |
39 | ! turn off LEX_RESWDOK, since we're going to read a pattern list. */ | |
40 | { | |
41 | ! tflags &= ~LEX_RESWDOK; | |
42 | ! /*itrace("parse_comsub:%d: lex_incase == 1 found `%c', lex_reswordok -> 0", line_number, ch);*/ | |
43 | ! } | |
44 | ! else if MBTEST(shellbreak (ch) == 0) | |
45 | ! { | |
46 | ! tflags &= ~LEX_RESWDOK; | |
47 | /*itrace("parse_comsub:%d: found `%c', lex_reswordok -> 0", line_number, ch);*/ | |
48 | } | |
49 | *** ../bash-4.0/patchlevel.h 2009-01-04 14:32:40.000000000 -0500 | |
50 | --- patchlevel.h 2009-02-22 16:11:31.000000000 -0500 | |
51 | *************** | |
52 | *** 26,30 **** | |
53 | looks for to find the patch level (for the sccs version string). */ | |
54 | ||
55 | ! #define PATCHLEVEL 9 | |
56 | ||
57 | #endif /* _PATCHLEVEL_H_ */ | |
58 | --- 26,30 ---- | |
59 | looks for to find the patch level (for the sccs version string). */ | |
60 | ||
61 | ! #define PATCHLEVEL 10 | |
62 | ||
63 | #endif /* _PATCHLEVEL_H_ */ |