X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=ncurses%2Fbase%2Fkeyok.c;h=ad8988cded3bf52b4cb9fc0da63192bb31b316a2;hp=4c9950600c33830ba295fbb237894e03cd918988;hb=3853a8e97d7efa8cb6a3c93c696d2c52895d6a70;hpb=027ae42953e3186daed8f3882da73de48291b606 diff --git a/ncurses/base/keyok.c b/ncurses/base/keyok.c index 4c995060..ad8988cd 100644 --- a/ncurses/base/keyok.c +++ b/ncurses/base/keyok.c @@ -27,12 +27,12 @@ ****************************************************************************/ /**************************************************************************** - * Author: Thomas E. Dickey 1997 * + * Author: Thomas E. Dickey 1997-on * ****************************************************************************/ #include -MODULE_ID("$Id: keyok.c,v 1.6 2006/06/17 18:18:43 tom Exp $") +MODULE_ID("$Id: keyok.c,v 1.7 2006/12/30 16:22:33 tom Exp $") /* * Enable (or disable) ncurses' interpretation of a keycode by adding (or @@ -57,18 +57,20 @@ keyok(int c, bool flag) if (flag) { while ((s = _nc_expand_try(SP->_key_ok, ch, &count, 0)) != 0 && _nc_remove_key(&(SP->_key_ok), ch)) { - _nc_add_to_try(&(SP->_keytry), s, ch); + code = _nc_add_to_try(&(SP->_keytry), s, ch); free(s); - code = OK; count = 0; + if (code != OK) + break; } } else { while ((s = _nc_expand_try(SP->_keytry, ch, &count, 0)) != 0 && _nc_remove_key(&(SP->_keytry), ch)) { - _nc_add_to_try(&(SP->_key_ok), s, ch); + code = _nc_add_to_try(&(SP->_key_ok), s, ch); free(s); - code = OK; count = 0; + if (code != OK) + break; } } }