diff options
| author | Sebastian Schmidt <yath@yath.de> | 2012-04-17 11:23:35 +0200 |
|---|---|---|
| committer | Sebastian Schmidt <yath@yath.de> | 2012-04-17 11:24:20 +0200 |
| commit | f4b417c62a4f272c4cf9a074d0f7a3a97201f9db (patch) | |
| tree | e2196f3b6361e2377c43ab47a3abf17d8f6afd77 /lib/readline/input.c | |
| parent | 791237e44695d2ee123c8a6f665ef074f5fadfbb (diff) | |
| download | external_bash-f4b417c62a4f272c4cf9a074d0f7a3a97201f9db.zip external_bash-f4b417c62a4f272c4cf9a074d0f7a3a97201f9db.tar.gz external_bash-f4b417c62a4f272c4cf9a074d0f7a3a97201f9db.tar.bz2 | |
Update to upstream bash 4.2
This upgrades bash to from 4.1-rc to 4.2-release. See CWRU/changelog for
changes.
Change-Id: I926269c300cf44fa25964b5b375a148fcf11c4b7
Diffstat (limited to 'lib/readline/input.c')
| -rw-r--r-- | lib/readline/input.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/lib/readline/input.c b/lib/readline/input.c index b5876da..7c74c99 100644 --- a/lib/readline/input.c +++ b/lib/readline/input.c @@ -1,6 +1,6 @@ /* input.c -- character input functions for readline. */ -/* Copyright (C) 1994-2009 Free Software Foundation, Inc. +/* Copyright (C) 1994-2010 Free Software Foundation, Inc. This file is part of the GNU Readline Library (Readline), a library for reading lines of text with interactive input and history editing. @@ -427,17 +427,19 @@ rl_read_key () /* If the user has an event function, then call it periodically. */ if (rl_event_hook) { - while (rl_event_hook && rl_get_char (&c) == 0) + while (rl_event_hook) { - (*rl_event_hook) (); - RL_CHECK_SIGNALS (); - if (rl_done) /* XXX - experimental */ - return ('\n'); if (rl_gather_tyi () < 0) /* XXX - EIO */ { rl_done = 1; return ('\n'); } + RL_CHECK_SIGNALS (); + if (rl_get_char (&c) != 0) + break; + if (rl_done) /* XXX - experimental */ + return ('\n'); + (*rl_event_hook) (); } } else |