ariadne
/
smol
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

binding: always initialize some keycode variables to a standard value 

Also when somehow key_defined() is missing.

This fixes https://savannah.gnu.org/bugs/?49614.
Reported-by: Mike Frysinger <vapier@gentoo.org>
master
Benno Schulenberg 2016-11-17 17:32:28 +01:00
parent e472b72565
commit f2c72bf759
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/nano.c
View File

@ -1553,18 +1553,18 @@ void terminal_init(void)
#endif #endif
} }
#ifdef HAVE_KEY_DEFINED
/* Ask ncurses for a keycode, or assign a default one. */ /* Ask ncurses for a keycode, or assign a default one. */
int get_keycode(const char *keyname, const int standard) int get_keycode(const char *keyname, const int standard)
{ {
#ifdef HAVE_KEY_DEFINED
const char *keyvalue = tigetstr(keyname); const char *keyvalue = tigetstr(keyname);
if (keyvalue == 0 || keyvalue == (char *)-1) if (keyvalue != 0 && keyvalue != (char *)-1)
return standard;
else
return key_defined(keyvalue); return key_defined(keyvalue);
} else
#endif #endif
return standard;
}
/* Say that an unbound key was struck, and if possible which one. */ /* Say that an unbound key was struck, and if possible which one. */
void unbound_key(int code) void unbound_key(int code)
@ -2580,14 +2580,12 @@ int main(int argc, char **argv)
interface_color_pair[FUNCTION_TAG] = A_NORMAL; interface_color_pair[FUNCTION_TAG] = A_NORMAL;
#endif #endif
#ifdef HAVE_KEY_DEFINED
/* Ask ncurses for the key codes for Control+Left/Right/Up/Down. */ /* Ask ncurses for the key codes for Control+Left/Right/Up/Down. */
controlleft = get_keycode("kLFT5", CONTROL_LEFT); controlleft = get_keycode("kLFT5", CONTROL_LEFT);
controlright = get_keycode("kRIT5", CONTROL_RIGHT); controlright = get_keycode("kRIT5", CONTROL_RIGHT);
controlup = get_keycode("kUP5", CONTROL_UP); controlup = get_keycode("kUP5", CONTROL_UP);
controldown = get_keycode("kDN5", CONTROL_DOWN); controldown = get_keycode("kDN5", CONTROL_DOWN);
#endif #ifndef NANO_TINY
#if !defined(NANO_TINY) && defined(HAVE_KEY_DEFINED)
/* Ask for the codes for Shift+Control+Left/Right/Up/Down. */ /* Ask for the codes for Shift+Control+Left/Right/Up/Down. */
shiftcontrolleft = get_keycode("kLFT6", SHIFT_CONTROL_LEFT); shiftcontrolleft = get_keycode("kLFT6", SHIFT_CONTROL_LEFT);
shiftcontrolright = get_keycode("kRIT6", SHIFT_CONTROL_RIGHT); shiftcontrolright = get_keycode("kRIT6", SHIFT_CONTROL_RIGHT);