ncurses 5.6

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

diff --git a/ncurses/base/define_key.c b/ncurses/base/define_key.c
index 0c8bc48debe25ad34133b76ddafaf57f8f0ad130..3b5299a338e4f1d23f46f8455700c1d99794bd36 100644 (file)
--- a/ncurses/base/define_key.c
+++ b/ncurses/base/define_key.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998-2000,2003 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2005,2006 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            *
@@ -27,12 +27,12 @@
  ****************************************************************************/
 
 /****************************************************************************
- *  Author: Thomas E. Dickey <dickey@clark.net> 1997                        *
+ *  Author: Thomas E. Dickey                    1997-on                     *
  ****************************************************************************/
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: define_key.c,v 1.8 2003/05/17 23:28:05 tom Exp $")
+MODULE_ID("$Id: define_key.c,v 1.10 2006/06/17 18:19:48 tom Exp $")
 
 NCURSES_EXPORT(int)
 define_key(const char *str, int keycode)
@@ -40,16 +40,18 @@ define_key(const char *str, int keycode)
     int code = ERR;
 
     T((T_CALLED("define_key(%s,%d)"), _nc_visbuf(str), keycode));
-    if (keycode > 0) {
+    if (SP == 0) {
+       code = ERR;
+    } else if (keycode > 0) {
        if (str != 0) {
            define_key(str, 0);
        } else if (has_key(keycode)) {
-           while (_nc_remove_key(&(SP->_keytry), keycode))
+           while (_nc_remove_key(&(SP->_keytry), (unsigned) keycode))
                code = OK;
        }
        if (str != 0) {
            if (key_defined(str) == 0) {
-               (void) _nc_add_to_try(&(SP->_keytry), str, keycode);
+               (void) _nc_add_to_try(&(SP->_keytry), str, (unsigned) keycode);
                code = OK;
            } else {
                code = ERR;