ncurses 6.2 - patch 20210320

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

diff --git a/ncurses/tinfo/lib_kernel.c b/ncurses/tinfo/lib_kernel.c
index 861c6541e294d12169a0e2fd727c4c60fe73a3a8..d5b021b80728991c65cd223736d167f0ae9832b0 100644 (file)
--- a/ncurses/tinfo/lib_kernel.c
+++ b/ncurses/tinfo/lib_kernel.c
@@ -1,5 +1,6 @@
 /****************************************************************************
- * Copyright (c) 1998-2004,2009 Free Software Foundation, Inc.              *
+ * Copyright 2020 Thomas E. Dickey                                          *
+ * Copyright 1998-2009,2010 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            *
@@ -47,10 +48,10 @@
  */
 
 #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.34 2020/11/21 22:05:58 tom Exp $")
 
+#ifdef TERMIOS
 static int
 _nc_vdisable(void)
 {
@@ -60,7 +61,7 @@ _nc_vdisable(void)
 #endif
 #if defined(_PC_VDISABLE)
     if (value == -1) {
-       value = fpathconf(0, _PC_VDISABLE);
+       value = (int) fpathconf(0, _PC_VDISABLE);
        if (value == -1) {
            value = 0377;
        }
@@ -71,6 +72,7 @@ _nc_vdisable(void)
 #endif
     return value;
 }
+#endif /* TERMIOS */
 
 /*
  *     erasechar()
@@ -83,18 +85,22 @@ NCURSES_EXPORT(char)
 NCURSES_SP_NAME(erasechar) (NCURSES_SP_DCL0)
 {
     int result = ERR;
-    T((T_CALLED("erasechar()")));
+    TERMINAL *termp = TerminalOf(SP_PARM);
+
+    T((T_CALLED("erasechar(%p)"), (void *) SP_PARM));
 
-    if (cur_term != 0) {
+    if (termp != 0) {
 #ifdef TERMIOS
-       result = cur_term->Ottyb.c_cc[VERASE];
+       result = termp->Ottyb.c_cc[VERASE];
        if (result == _nc_vdisable())
            result = ERR;
+#elif defined(EXP_WIN32_DRIVER)
+       result = ERR;
 #else
-       result = cur_term->Ottyb.sg_erase;
+       result = termp->Ottyb.sg_erase;
 #endif
     }
-    returnCode(result);
+    returnChar((char) result);
 }
 
 #if NCURSES_SP_FUNCS
@@ -116,18 +122,22 @@ 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;
+#elif defined(EXP_WIN32_DRIVER)
+       result = ERR;
 #else
-       result = cur_term->Ottyb.sg_kill;
+       result = termp->Ottyb.sg_kill;
 #endif
     }
-    returnCode(result);
+    returnChar((char) result);
 }
 
 #if NCURSES_SP_FUNCS
@@ -148,15 +158,21 @@ killchar(void)
 NCURSES_EXPORT(int)
 NCURSES_SP_NAME(flushinp) (NCURSES_SP_DCL0)
 {
-    T((T_CALLED("flushinp()")));
+    TERMINAL *termp = TerminalOf(SP_PARM);
 
-    if (cur_term != 0) {
+    T((T_CALLED("flushinp(%p)"), (void *) SP_PARM));
+
+    if (termp != 0) {
 #ifdef TERMIOS
-       tcflush(cur_term->Filedes, TCIFLUSH);
+       tcflush(termp->Filedes, TCIFLUSH);
 #else
        errno = 0;
        do {
-           ioctl(cur_term->Filedes, TIOCFLUSH, 0);
+#if defined(EXP_WIN32_DRIVER)
+           _nc_console_flush(_nc_console_fd2handle(termp->Filedes));
+#else
+           ioctl(termp->Filedes, TIOCFLUSH, 0);
+#endif
        } while
            (errno == EINTR);
 #endif