dmbcs/i-bash
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Bash-4.2 patch 31

Browse source
This commit is contained in:
Chet Ramey 2012-07-10 09:43:57 -04:00
commit 7a127e743d
2 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
lib/readline/input.c
View file

@ -409,7 +409,7 @@ rl_clear_pending_input ()
int int
rl_read_key () rl_read_key ()
{ {
int c; int c, r;
rl_key_sequence_length++; rl_key_sequence_length++;
@ -429,14 +429,18 @@ rl_read_key ()
{ {
while (rl_event_hook) while (rl_event_hook)
{ {
if (rl_gather_tyi () < 0) /* XXX - EIO */ if (rl_get_char (&c) != 0)
break;
if ((r = rl_gather_tyi ()) < 0) /* XXX - EIO */
{ {
rl_done = 1; rl_done = 1;
return ('\n'); return ('\n');
} }
else if (r == 1) /* read something */
continue;
RL_CHECK_SIGNALS (); RL_CHECK_SIGNALS ();
if (rl_get_char (&c) != 0)
break;
if (rl_done) /* XXX - experimental */ if (rl_done) /* XXX - experimental */
return ('\n'); return ('\n');
(*rl_event_hook) (); (*rl_event_hook) ();

2
patchlevel.h
View file

@ -25,6 +25,6 @@
regexp `^#define[ ]*PATCHLEVEL', since that's what support/mkversion.sh regexp `^#define[ ]*PATCHLEVEL', since that's what support/mkversion.sh
looks for to find the patch level (for the sccs version string). */ looks for to find the patch level (for the sccs version string). */
#define PATCHLEVEL 30 #define PATCHLEVEL 31
#endif /* _PATCHLEVEL_H_ */ #endif /* _PATCHLEVEL_H_ */