pmodules/bash
0
0
Fork 0
mirror of https://https.git.savannah.gnu.org/git/bash.git synced 2026-07-04 02:40:49 +02:00
Code Issues Packages Projects Releases Wiki Activity

commit bash-20090413 snapshot

Browse Source
This commit is contained in:
Chet Ramey
2011-12-08 20:07:56 -05:00
parent 0d8616ff05
commit 83c14a205e
9 changed files with 52 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CWRU/CWRU.chlog
+22
View File
@@ -7912,3 +7912,25 @@ lib/readline/rlprivate.h
lib/readline/display.c
- block SIGWINCH during redisplay like SIGINT. Should fix bug reported
by Nicolai Lissner <nlissne@linux01.org>
4/13
----
lib/readline/readline.h
- new readline state variable: RL_STATE_REDISPLAYING
lib/readline/display.c
- in rl_redisplay, don't block SIGWINCH during redisplay; just set
the REDISPLAYING state
lib/readline/terminal.c
- in rl_resize_terminal, don't call rl_redisplay_after_sigwinch() if
we're already in the middle of redisplay (RL_STATE_REDISPLAYING).
Fix for bug reported by Nicolai Lissner <nlissne@linux01.org>
4/15
----
parse.y
- fix parse_comsub to add check for \n when seeing whether the current
character can change to a state where a reserved word is legal,
since it is not a shell meta character. Fixes bug reported by
Bernd Eggink <monoped@sudrala.de>.
CWRU/CWRU.chlog~
+16 -1
View File
@@ -7910,4 +7910,19 @@ lib/readline/rlprivate.h
- new extern declarations for _rl_block_sigwinch and _rl_release_sigwinch
lib/readline/display.c
- block SIGWINCH during redisplay like SIGINT
- block SIGWINCH during redisplay like SIGINT. Should fix bug reported
by Nicolai Lissner <nlissne@linux01.org>
4/13
----
lib/readline/readline.h
- new readline state variable: RL_STATE_REDISPLAYING
lib/readline/display.c
- in rl_redisplay, don't block SIGWINCH during redisplay; just set
the REDISPLAYING state
lib/readline/terminal.c
- in rl_resize_terminal, don't call rl_redisplay_after_sigwinch() if
we're already in the middle of redisplay (RL_STATE_REDISPLAYING).
Fix for bug reported by Nicolai Lissner <nlissne@linux01.org>
lib/readline/display.c
+3 -3
View File
@@ -512,7 +512,7 @@ rl_redisplay ()
/* Block keyboard interrupts because this function manipulates global
data structures. */
_rl_block_sigint ();
_rl_block_sigwinch ();
RL_SETSTATE (RL_STATE_REDISPLAYING);
if (!rl_display_prompt)
rl_display_prompt = "";
@@ -1237,8 +1237,8 @@ rl_redisplay ()
visible_wrap_offset = wrap_offset;
}
RL_UNSETSTATE (RL_STATE_REDISPLAYING);
_rl_release_sigint ();
_rl_release_sigwinch ();
}
/* PWP: update_line() is based on finding the middle difference of each
@@ -1774,7 +1774,7 @@ update_line (old, new, current_line, omax, nmax, inv_botlin)
space_to_eol will insert too many spaces. XXX - maybe we should
adjust col_lendiff based on the difference between _rl_last_c_pos
and _rl_screenwidth */
if (col_lendiff && (_rl_last_c_pos < _rl_screenwidth))
if (col_lendiff && ((MB_CUR_MAX == 1 || rl_byte_oriented) || (_rl_last_c_pos < _rl_screenwidth)))
#endif
{
if (_rl_term_autowrap && current_line < inv_botlin)
lib/readline/display.c~
+2
View File
@@ -512,6 +512,7 @@ rl_redisplay ()
/* Block keyboard interrupts because this function manipulates global
data structures. */
_rl_block_sigint ();
RL_SETSTATE (RL_STATE_REDISPLAYING);
if (!rl_display_prompt)
rl_display_prompt = "";
@@ -1236,6 +1237,7 @@ rl_redisplay ()
visible_wrap_offset = wrap_offset;
}
RL_UNSETSTATE (RL_STATE_REDISPLAYING);
_rl_release_sigint ();
}
lib/readline/readline.h
+2 -1
View File
@@ -814,8 +814,9 @@ extern int rl_inhibit_completion;
#define RL_STATE_VIMOTION 0x100000 /* reading vi motion arg */
#define RL_STATE_MULTIKEY 0x200000 /* reading multiple-key command */
#define RL_STATE_VICMDONCE 0x400000 /* entered vi command mode at least once */
#define RL_STATE_REDISPLAYING 0x800000 /* updating terminal display */
#define RL_STATE_DONE 0x800000 /* done; accepted line */
#define RL_STATE_DONE 0x1000000 /* done; accepted line */
#define RL_SETSTATE(x) (rl_readline_state |= (x))
#define RL_UNSETSTATE(x) (rl_readline_state &= ~(x))
lib/readline/terminal.c
+1 -1
View File
@@ -355,7 +355,7 @@ rl_resize_terminal ()
_rl_get_screen_size (fileno (rl_instream), 1);
if (CUSTOM_REDISPLAY_FUNC ())
rl_forced_update_display ();
else
else if (RL_ISSTATE(RL_STATE_REDISPLAYING) == 0)
_rl_redisplay_after_sigwinch ();
}
}
parse.y
+1 -1
View File
@@ -3374,7 +3374,7 @@ eof_error:
}
/* Meta-characters that can introduce a reserved word. Not perfect yet. */
if MBTEST((tflags & LEX_RESWDOK) == 0 && (tflags & LEX_CKCASE) && (tflags & LEX_INCOMMENT) == 0 && shellmeta(ch))
if MBTEST((tflags & LEX_RESWDOK) == 0 && (tflags & LEX_CKCASE) && (tflags & LEX_INCOMMENT) == 0 && (shellmeta(ch) || ch == '\n'))
{
/* Add this character. */
RESIZE_MALLOCED_BUFFER (ret, retind, 1, retsize, 64);
parse.y~
+4 -4
View File
@@ -1879,7 +1879,7 @@ read_secondary_line (remove_quoted_newline)
prompt_again ();
ret = read_a_line (remove_quoted_newline);
#if defined (HISTORY)
if (remember_on_history && (parser_state & PST_HEREDOC))
if (ret && remember_on_history && (parser_state & PST_HEREDOC))
{
/* To make adding the the here-document body right, we need to rely
on history_delimiting_chars() returning \n for the first line of
@@ -3374,7 +3374,7 @@ eof_error:
}
/* Meta-characters that can introduce a reserved word. Not perfect yet. */
if MBTEST((tflags & LEX_RESWDOK) == 0 && (tflags & LEX_CKCASE) && (tflags & LEX_INCOMMENT) == 0 && shellmeta(ch))
if MBTEST((tflags & LEX_RESWDOK) == 0 && (tflags & LEX_CKCASE) && (tflags & LEX_INCOMMENT) == 0 && (shellmeta(ch) || ch == '\n'))
{
/* Add this character. */
RESIZE_MALLOCED_BUFFER (ret, retind, 1, retsize, 64);
@@ -3505,12 +3505,12 @@ eof_error:
else if MBTEST(ch == close && (tflags & LEX_INCASE) == 0) /* ending delimiter */
{
count--;
/*itrace("parse_comsub:%d: found close: count = %d", line_number, count);*/
itrace("parse_comsub:%d: found close: count = %d", line_number, count);
}
else if MBTEST(((flags & P_FIRSTCLOSE) == 0) && (tflags & LEX_INCASE) == 0 && ch == open) /* nested begin */
{
count++;
/*itrace("parse_comsub:%d: found open: count = %d", line_number, count);*/
itrace("parse_comsub:%d: found open: count = %d", line_number, count);
}
/* Add this character. */
tests/RUN-ONE-TEST
+1 -1
View File
@@ -1,4 +1,4 @@
BUILD_DIR=/usr/local/build/chet/bash/bash-current
BUILD_DIR=/usr/local/build/bash/bash-current
THIS_SH=$BUILD_DIR/bash
PATH=$PATH:$BUILD_DIR