diff options
| author |   millert <millert@openbsd.org> | 1999-02-24 06:31:06 +0000 |
|---|---|---|
| committer | millert <millert@openbsd.org> | 1999-02-24 06:31:06 +0000 |
| commit | c21ba70dd518c922f8dfa93d6c24c449ab5763d9 (patch) | |
| tree | 4d7a8f9a9718bdde7f535c1bbcb739a8a338ad3b /lib/libcurses/base/keyok.c | |
| parent | updates from ncurses-4.2-990220 (diff) | |
| download | wireguard-openbsd-c21ba70dd518c922f8dfa93d6c24c449ab5763d9.tar.xz wireguard-openbsd-c21ba70dd518c922f8dfa93d6c24c449ab5763d9.zip | |
ncurses-4.2-990220; this is a pre-release of 5.0
Diffstat (limited to 'lib/libcurses/base/keyok.c')
| -rw-r--r-- | lib/libcurses/base/keyok.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/lib/libcurses/base/keyok.c b/lib/libcurses/base/keyok.c index fb343b12162..24736fe8d93 100644 --- a/lib/libcurses/base/keyok.c +++ b/lib/libcurses/base/keyok.c @@ -1,4 +1,4 @@ -/* $OpenBSD: keyok.c,v 1.1 1999/01/18 19:09:34 millert Exp $ */ +/* $OpenBSD: keyok.c,v 1.2 1999/02/24 06:31:08 millert Exp $ */ /**************************************************************************** * Copyright (c) 1998 Free Software Foundation, Inc. * @@ -34,7 +34,7 @@ #include <curses.priv.h> -MODULE_ID("$From: keyok.c,v 1.2 1998/02/11 12:13:54 tom Exp $") +MODULE_ID("$From: keyok.c,v 1.3 1999/02/19 11:29:48 tom Exp $") /* * Enable (or disable) ncurses' interpretation of a keycode by adding (or @@ -49,22 +49,25 @@ MODULE_ID("$From: keyok.c,v 1.2 1998/02/11 12:13:54 tom Exp $") int keyok(int c, bool flag) { int code = ERR; + int count = 0; char *s; T((T_CALLED("keyok(%d,%d)"), c, flag)); if (flag) { - if ((s = _nc_expand_try(SP->_key_ok, c, 0)) != 0 + while ((s = _nc_expand_try(SP->_key_ok, c, &count, 0)) != 0 && _nc_remove_key(&(SP->_key_ok), c)) { _nc_add_to_try(&(SP->_keytry), s, c); free(s); code = OK; + count = 0; } } else { - if ((s = _nc_expand_try(SP->_keytry, c, 0)) != 0 + while ((s = _nc_expand_try(SP->_keytry, c, &count, 0)) != 0 && _nc_remove_key(&(SP->_keytry), c)) { _nc_add_to_try(&(SP->_key_ok), s, c); free(s); code = OK; + count = 0; } } returnCode(code); |