ncurses 6.1 - patch 20191221

[ncurses.git] / ncurses / base / keyok.c

diff --git a/ncurses/base/keyok.c b/ncurses/base/keyok.c
index ed00ba75956001b8fcb49252213904082292558d..180c54aa191c97559da2085fac1fc25ad057d6c4 100644 (file)
--- a/ncurses/base/keyok.c
+++ b/ncurses/base/keyok.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998-2006,2009 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2014,2019 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,7 +33,7 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: keyok.c,v 1.9 2009/06/06 19:24:57 tom Exp $")
+MODULE_ID("$Id: keyok.c,v 1.15 2019/12/21 22:40:32 tom Exp $")
 
 /*
  * Enable (or disable) ncurses' interpretation of a keycode by adding (or
@@ -50,37 +50,46 @@ NCURSES_SP_NAME(keyok) (NCURSES_SP_DCLx int c, bool flag)
 {
     int code = ERR;
 
-    T((T_CALLED("keyok(%p, %d,%d)"), SP_PARM, c, 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 (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;
-           }
-       } 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;
+           if (flag) {
+               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, (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);
+                   }
+               }
            }
        }
-    }
 #endif
+    }
     returnCode(code);
 }