X-Git-Url: http://ncurses.scripts.mit.edu/?a=blobdiff_plain;ds=sidebyside;f=ncurses%2Fbase%2Fkeyok.c;h=945228aa803535366b7f88bdb769aad1509bf256;hb=9f479192e3ca3413d235c66bf058f8cc63764898;hp=d700be491038d9c691d84ad9cc15cf859dac313e;hpb=331f875facea2b7897c1ce0425ce0d111cc4175b;p=ncurses.git

diff --git a/ncurses/base/keyok.c b/ncurses/base/keyok.c
index d700be49..945228aa 100644
--- a/ncurses/base/keyok.c
+++ b/ncurses/base/keyok.c
@@ -1,5 +1,6 @@
 /****************************************************************************
- * Copyright (c) 1998-2009,2011 Free Software Foundation, Inc.              *
+ * Copyright 2019-2020,2021 Thomas E. Dickey                                *
+ * Copyright 1998-2012,2014 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *
@@ -33,13 +34,13 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: keyok.c,v 1.11 2011/06/04 19:24:16 tom Exp $")
+MODULE_ID("$Id: keyok.c,v 1.17 2021/06/17 21:26:02 tom Exp $")
 
 /*
  * Enable (or disable) ncurses' interpretation of a keycode by adding (or
  * removing) the corresponding 'tries' entry.
  *
- * Do this by storing a second tree of tries, which records the disabled keys. 
+ * Do this by storing a second tree of tries, which records the disabled keys.
  * The simplest way to copy is to make a function that returns the string (with
  * nulls set to 0200), then use that to reinsert the string into the
  * corresponding tree.
@@ -53,33 +54,38 @@ NCURSES_SP_NAME(keyok) (NCURSES_SP_DCLx int c, bool flag)
     if (HasTerminal(SP_PARM)) {
 	T((T_CALLED("keyok(%p, %d,%d)"), (void *) SP_PARM, c, flag));
 #ifdef USE_TERM_DRIVER
-	code = CallDriver_2(sp, kyOk, c, flag);
+	code = CallDriver_2(sp, td_kyOk, c, flag);
 #else
-	T((T_CALLED("keyok(%d,%d)"), c, flag));
 	if (c >= 0) {
 	    int count = 0;
 	    char *s;
 	    unsigned ch = (unsigned) c;
 
 	    if (flag) {
-		while ((s = _nc_expand_try(SP_PARM->_key_ok, ch, &count, 0))
-		       != 0
-		       && _nc_remove_key(&(SP_PARM->_key_ok), ch)) {
-		    code = _nc_add_to_try(&(SP_PARM->_keytry), s, ch);
-		    free(s);
-		    count = 0;
-		    if (code != OK)
-			break;
+		while ((s = _nc_expand_try(SP_PARM->_key_ok,
+					   ch, &count, (size_t) 0)) != 0) {
+		    if (_nc_remove_key(&(SP_PARM->_key_ok), ch)) {
+			code = _nc_add_to_try(&(SP_PARM->_keytry), s, ch);
+			free(s);
+			count = 0;
+			if (code != OK)
+			    break;
+		    } else {
+			free(s);
+		    }
 		}
 	    } else {
-		while ((s = _nc_expand_try(SP_PARM->_keytry, ch, &count, 0))
-		       != 0
-		       && _nc_remove_key(&(SP_PARM->_keytry), ch)) {
-		    code = _nc_add_to_try(&(SP_PARM->_key_ok), s, ch);
-		    free(s);
-		    count = 0;
-		    if (code != OK)
-			break;
+		while ((s = _nc_expand_try(SP_PARM->_keytry,
+					   ch, &count, (size_t) 0)) != 0) {
+		    if (_nc_remove_key(&(SP_PARM->_keytry), ch)) {
+			code = _nc_add_to_try(&(SP_PARM->_key_ok), s, ch);
+			free(s);
+			count = 0;
+			if (code != OK)
+			    break;
+		    } else {
+			free(s);
+		    }
 		}
 	    }
 	}