projects / packages / bash.git / blame
| Commit | Line | Data |
|---|---|---|
| 39cb2ba7 AM |
1 | BASH PATCH REPORT |
| 2 | ================= | |
| 3 | ||
| 4 | Bash-Release: 4.0 | |
| 5 | Patch-ID: bash40-003 | |
| 6 | ||
| 7 | Bug-Reported-by: Bernd Eggink <monoped@sudrala.de> | |
| 8 | Bug-Reference-ID: <49A323F5.60503@sudrala.de> | |
| 9 | Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2009-02/msg00177.html | |
| 10 | ||
| 11 | Bug-Description: | |
| 12 | ||
| 13 | Under certain circumstances, constructs containing command substitutions | |
| 14 | prevent PS1 from being re-evaluated and updated before being displayed. | |
| 15 | ||
| 16 | Patch: | |
| 17 | ||
| 18 | *** ../bash-4.0/parse.y 2009-01-08 08:29:12.000000000 -0500 | |
| 19 | --- parse.y 2009-02-25 15:58:25.000000000 -0500 | |
| 20 | *************** | |
| 21 | *** 1616,1623 **** | |
| 22 | int *ret; | |
| 23 | ||
| 24 | ! ret = (int *)xmalloc (3 * sizeof (int)); | |
| 25 | ret[0] = last_read_token; | |
| 26 | ret[1] = token_before_that; | |
| 27 | ret[2] = two_tokens_ago; | |
| 28 | return ret; | |
| 29 | } | |
| 30 | --- 1616,1624 ---- | |
| 31 | int *ret; | |
| 32 | ||
| 33 | ! ret = (int *)xmalloc (4 * sizeof (int)); | |
| 34 | ret[0] = last_read_token; | |
| 35 | ret[1] = token_before_that; | |
| 36 | ret[2] = two_tokens_ago; | |
| 37 | + ret[3] = current_token; | |
| 38 | return ret; | |
| 39 | } | |
| 40 | *************** | |
| 41 | *** 1632,1635 **** | |
| 42 | --- 1633,1637 ---- | |
| 43 | token_before_that = ts[1]; | |
| 44 | two_tokens_ago = ts[2]; | |
| 45 | + current_token = ts[3]; | |
| 46 | } | |
| 47 | ||
| 48 | *************** | |
| 49 | *** 2669,2672 **** | |
| 50 | --- 2671,2675 ---- | |
| 51 | word_desc_to_read = (WORD_DESC *)NULL; | |
| 52 | ||
| 53 | + current_token = '\n'; /* XXX */ | |
| 54 | last_read_token = '\n'; | |
| 55 | token_to_read = '\n'; | |
| 56 | *** ../bash-4.0/patchlevel.h 2009-01-04 14:32:40.000000000 -0500 | |
| 57 | --- patchlevel.h 2009-02-22 16:11:31.000000000 -0500 | |
| 58 | *************** | |
| 59 | *** 26,30 **** | |
| 60 | looks for to find the patch level (for the sccs version string). */ | |
| 61 | ||
| 62 | ! #define PATCHLEVEL 2 | |
| 63 | ||
| 64 | #endif /* _PATCHLEVEL_H_ */ | |
| 65 | --- 26,30 ---- | |
| 66 | looks for to find the patch level (for the sccs version string). */ | |
| 67 | ||
| 68 | ! #define PATCHLEVEL 3 | |
| 69 | ||
| 70 | #endif /* _PATCHLEVEL_H_ */ |