ncurses 5.7 - patch 20091219

[ncurses.git] / ncurses / tinfo / lib_kernel.c

diff --git a/ncurses/tinfo/lib_kernel.c b/ncurses/tinfo/lib_kernel.c
index 861c6541e294d12169a0e2fd727c4c60fe73a3a8..8b4433ae2c230a1e2c4d65684da1d5d39a281ad0 100644 (file)
--- a/ncurses/tinfo/lib_kernel.c
+++ b/ncurses/tinfo/lib_kernel.c
@@ -47,9 +47,8 @@
  */
 
 #include <curses.priv.h>
-#include <term.h>              /* cur_term */
 
-MODULE_ID("$Id: lib_kernel.c,v 1.25 2009/02/15 00:47:52 tom Exp $")
+MODULE_ID("$Id: lib_kernel.c,v 1.28 2009/10/24 22:15:47 tom Exp $")
 
 static int
 _nc_vdisable(void)
@@ -83,15 +82,17 @@ NCURSES_EXPORT(char)
 NCURSES_SP_NAME(erasechar) (NCURSES_SP_DCL0)
 {
     int result = ERR;
-    T((T_CALLED("erasechar()")));
+    TERMINAL *termp = TerminalOf(SP_PARM);
 
-    if (cur_term != 0) {
+    T((T_CALLED("erasechar(%p)"), (void *) SP_PARM));
+
+    if (termp != 0) {
 #ifdef TERMIOS
-       result = cur_term->Ottyb.c_cc[VERASE];
+       result = termp->Ottyb.c_cc[VERASE];
        if (result == _nc_vdisable())
            result = ERR;
 #else
-       result = cur_term->Ottyb.sg_erase;
+       result = termp->Ottyb.sg_erase;
 #endif
     }
     returnCode(result);
@@ -116,15 +117,17 @@ NCURSES_EXPORT(char)
 NCURSES_SP_NAME(killchar) (NCURSES_SP_DCL0)
 {
     int result = ERR;
-    T((T_CALLED("killchar()")));
+    TERMINAL *termp = TerminalOf(SP_PARM);
+
+    T((T_CALLED("killchar(%p)"), (void *) SP_PARM));
 
-    if (cur_term != 0) {
+    if (termp != 0) {
 #ifdef TERMIOS
-       result = cur_term->Ottyb.c_cc[VKILL];
+       result = termp->Ottyb.c_cc[VKILL];
        if (result == _nc_vdisable())
            result = ERR;
 #else
-       result = cur_term->Ottyb.sg_kill;
+       result = termp->Ottyb.sg_kill;
 #endif
     }
     returnCode(result);
@@ -148,15 +151,17 @@ killchar(void)
 NCURSES_EXPORT(int)
 NCURSES_SP_NAME(flushinp) (NCURSES_SP_DCL0)
 {
-    T((T_CALLED("flushinp()")));
+    TERMINAL *termp = TerminalOf(SP_PARM);
+
+    T((T_CALLED("flushinp(%p)"), (void *) SP_PARM));
 
-    if (cur_term != 0) {
+    if (termp != 0) {
 #ifdef TERMIOS
-       tcflush(cur_term->Filedes, TCIFLUSH);
+       tcflush(termp->Filedes, TCIFLUSH);
 #else
        errno = 0;
        do {
-           ioctl(cur_term->Filedes, TIOCFLUSH, 0);
+           ioctl(termp->Filedes, TIOCFLUSH, 0);
        } while
            (errno == EINTR);
 #endif