projects / packages / bash.git / blame
| Commit | Line | Data |
|---|---|---|
| fb8ce753 AM |
1 | BASH PATCH REPORT |
| 2 | ================= | |
| 3 | ||
| 4 | Bash-Release: 4.0 | |
| 5 | Patch-ID: bash40-020 | |
| 6 | ||
| 7 | Bug-Reported-by: Nicolai Lissner <nlissne@linux01.org> | |
| 8 | Bug-Reference-ID: <20090412020510.GA29658@lilith> | |
| 9 | Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2009-04/msg00104.html | |
| 10 | ||
| 11 | Bug-Description: | |
| 12 | ||
| 13 | If a SIGWINCH arrives while bash is performing redisplay, multi-line prompts | |
| 14 | are displayed incorrectly due to the display code being called recursively. | |
| 15 | ||
| 16 | Patch: | |
| 17 | ||
| 18 | *** ../bash-4.0-patched/lib/readline/readline.h 2009-01-04 14:32:33.000000000 -0500 | |
| 19 | --- lib/readline/readline.h 2009-04-13 08:47:00.000000000 -0400 | |
| 20 | *************** | |
| 21 | *** 815,820 **** | |
| 22 | #define RL_STATE_MULTIKEY 0x200000 /* reading multiple-key command */ | |
| 23 | #define RL_STATE_VICMDONCE 0x400000 /* entered vi command mode at least once */ | |
| 24 | ||
| 25 | ! #define RL_STATE_DONE 0x800000 /* done; accepted line */ | |
| 26 | ||
| 27 | #define RL_SETSTATE(x) (rl_readline_state |= (x)) | |
| 28 | --- 815,821 ---- | |
| 29 | #define RL_STATE_MULTIKEY 0x200000 /* reading multiple-key command */ | |
| 30 | #define RL_STATE_VICMDONCE 0x400000 /* entered vi command mode at least once */ | |
| 31 | + #define RL_STATE_REDISPLAYING 0x800000 /* updating terminal display */ | |
| 32 | ||
| 33 | ! #define RL_STATE_DONE 0x1000000 /* done; accepted line */ | |
| 34 | ||
| 35 | #define RL_SETSTATE(x) (rl_readline_state |= (x)) | |
| 36 | *** ../bash-4.0-patched/lib/readline/display.c 2009-01-04 14:32:32.000000000 -0500 | |
| 37 | --- lib/readline/display.c 2009-04-13 08:29:54.000000000 -0400 | |
| 38 | *************** | |
| 39 | *** 513,516 **** | |
| 40 | --- 513,517 ---- | |
| 41 | data structures. */ | |
| 42 | _rl_block_sigint (); | |
| 43 | + RL_SETSTATE (RL_STATE_REDISPLAYING); | |
| 44 | ||
| 45 | if (!rl_display_prompt) | |
| 46 | *************** | |
| 47 | *** 1237,1240 **** | |
| 48 | --- 1238,1242 ---- | |
| 49 | } | |
| 50 | ||
| 51 | + RL_UNSETSTATE (RL_STATE_REDISPLAYING); | |
| 52 | _rl_release_sigint (); | |
| 53 | } | |
| 54 | *** ../bash-4.0-patched/lib/readline/terminal.c 2009-01-04 14:32:34.000000000 -0500 | |
| 55 | --- lib/readline/terminal.c 2009-04-13 08:43:00.000000000 -0400 | |
| 56 | *************** | |
| 57 | *** 356,360 **** | |
| 58 | if (CUSTOM_REDISPLAY_FUNC ()) | |
| 59 | rl_forced_update_display (); | |
| 60 | ! else | |
| 61 | _rl_redisplay_after_sigwinch (); | |
| 62 | } | |
| 63 | --- 356,360 ---- | |
| 64 | if (CUSTOM_REDISPLAY_FUNC ()) | |
| 65 | rl_forced_update_display (); | |
| 66 | ! else if (RL_ISSTATE(RL_STATE_REDISPLAYING) == 0) | |
| 67 | _rl_redisplay_after_sigwinch (); | |
| 68 | } | |
| 69 | *** ../bash-4.0/patchlevel.h 2009-01-04 14:32:40.000000000 -0500 | |
| 70 | --- patchlevel.h 2009-02-22 16:11:31.000000000 -0500 | |
| 71 | *************** | |
| 72 | *** 26,30 **** | |
| 73 | looks for to find the patch level (for the sccs version string). */ | |
| 74 | ||
| 75 | ! #define PATCHLEVEL 19 | |
| 76 | ||
| 77 | #endif /* _PATCHLEVEL_H_ */ | |
| 78 | --- 26,30 ---- | |
| 79 | looks for to find the patch level (for the sccs version string). */ | |
| 80 | ||
| 81 | ! #define PATCHLEVEL 20 | |
| 82 | ||
| 83 | #endif /* _PATCHLEVEL_H_ */ |