[src/trunk]: src/lib/libcurses Check _cursesi_term is set in a few places and...

[roy <roy%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/3424b24e9beb
branches:  trunk
changeset: 821260:3424b24e9beb
user:      roy <roy%NetBSD.org@localhost>
date:      Mon Jan 30 16:50:44 2017 +0000

description:
Check _cursesi_term is set in a few places and sprinkle some static.

diffstat:

 lib/libcurses/getch.c   |  28 +++++++++++++++++++---------
 lib/libcurses/setterm.c |   6 ++++--
 2 files changed, 23 insertions(+), 11 deletions(-)

diffs (135 lines):

diff -r d2b26d076162 -r 3424b24e9beb lib/libcurses/getch.c
--- a/lib/libcurses/getch.c     Mon Jan 30 15:56:44 2017 +0000
+++ b/lib/libcurses/getch.c     Mon Jan 30 16:50:44 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: getch.c,v 1.63 2017/01/30 14:55:58 roy Exp $   */
+/*     $NetBSD: getch.c,v 1.64 2017/01/30 16:50:44 roy Exp $   */
 
 /*
  * Copyright (c) 1981, 1993, 1994
@@ -34,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)getch.c    8.2 (Berkeley) 5/4/94";
 #else
-__RCSID("$NetBSD: getch.c,v 1.63 2017/01/30 14:55:58 roy Exp $");
+__RCSID("$NetBSD: getch.c,v 1.64 2017/01/30 16:50:44 roy Exp $");
 #endif
 #endif                                 /* not lint */
 
@@ -342,7 +342,7 @@
  * Delete the given key symbol from the key mappings for the screen.
  *
  */
-void
+static void
 delete_key_sequence(keymap_t *current, int key_type)
 {
        key_entry_t *key;
@@ -379,7 +379,7 @@
  * Add the sequence of characters given in sequence as the key mapping
  * for the given key symbol.
  */
-void
+static void
 add_key_sequence(SCREEN *screen, char *sequence, int key_type)
 {
        key_entry_t *tmp_key;
@@ -543,7 +543,7 @@
  *
  */
 
-wchar_t
+static wchar_t
 inkey(int to, int delay)
 {
        wchar_t          k;
@@ -736,7 +736,9 @@
 {
        int result = ERR;
 
-       do_keyok(_cursesi_screen->base_keymap, key_type, true, flag, &result);
+       if (_cursesi_screen != NULL)
+               do_keyok(_cursesi_screen->base_keymap, key_type,
+                   true, flag, &result);
        return result;
 }
 
@@ -781,7 +783,7 @@
 define_key(char *sequence, int symbol)
 {
 
-       if (symbol <= 0)
+       if (symbol <= 0 || _cursesi_screen == NULL)
                return ERR;
 
        if (sequence == NULL) {
@@ -810,10 +812,12 @@
 #ifdef DEBUG
        __CTRACE(__CTRACE_INPUT, "wgetch: win(%p)\n", win);
 #endif
+       if (win == NULL)
+               return ERR;
        if (!(win->flags & __SCROLLOK) && (win->flags & __FULLWIN)
            && win->curx == win->maxx - 1 && win->cury == win->maxy - 1
            && __echoit)
-               return (ERR);
+               return ERR;
 
        if (is_wintouched(win))
                wrefresh(win);
@@ -946,6 +950,8 @@
 #ifdef DEBUG
        __CTRACE(__CTRACE_INPUT, "__unget(%x)\n", c);
 #endif
+       if (_cursesi_screen == NULL)
+               return ERR;
        if (_cursesi_screen->unget_pos >= _cursesi_screen->unget_len) {
                len = _cursesi_screen->unget_len + 32;
                if ((p = realloc(_cursesi_screen->unget_list,
@@ -976,7 +982,9 @@
 {
        int result = ERR;
 
-       do_keyok(_cursesi_screen->base_keymap, key_type, false, false, &result);
+       if (_cursesi_screen != NULL)
+               do_keyok(_cursesi_screen->base_keymap, key_type,
+                   false, false, &result);
        return result;
 }
 
@@ -988,6 +996,8 @@
 set_escdelay(int escdelay)
 {
 
+       if (_cursesi_screen == NULL)
+               return ERR;
        _cursesi_screen->ESCDELAY = escdelay;
        _reentrant = true;
        ESCDELAY = escdelay;
diff -r d2b26d076162 -r 3424b24e9beb lib/libcurses/setterm.c
--- a/lib/libcurses/setterm.c   Mon Jan 30 15:56:44 2017 +0000
+++ b/lib/libcurses/setterm.c   Mon Jan 30 16:50:44 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: setterm.c,v 1.62 2017/01/30 14:55:58 roy Exp $ */
+/*     $NetBSD: setterm.c,v 1.63 2017/01/30 16:50:44 roy Exp $ */
 
 /*
  * Copyright (c) 1981, 1993, 1994
@@ -34,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)setterm.c  8.8 (Berkeley) 10/25/94";
 #else
-__RCSID("$NetBSD: setterm.c,v 1.62 2017/01/30 14:55:58 roy Exp $");
+__RCSID("$NetBSD: setterm.c,v 1.63 2017/01/30 16:50:44 roy Exp $");
 #endif
 #endif /* not lint */
 
@@ -403,6 +403,8 @@
 set_tabsize(int tabsize)
 {
 
+       if (_cursesi_screen == NULL)
+               return ERR;
        _cursesi_screen->TABSIZE = tabsize;
        _reentrant = true;
        TABSIZE = tabsize;