ncurses 6.2 - patch 20200906

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

diff --git a/ncurses/tinfo/lib_kernel.c b/ncurses/tinfo/lib_kernel.c
index 558b20730dc17d84a01982dbce54e412104cedd3..84ec299ff503796b80af1af08a451e073d66ea51 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            *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *


@@ -48,7 +49,7 @@
 
 #include <curses.priv.h>
 
 
 #include <curses.priv.h>
 

-MODULE_ID("$Id: lib_kernel.c,v 1.27 2009/06/06 21:25:50 tom Exp $")
+MODULE_ID("$Id: lib_kernel.c,v 1.33 2020/09/05 21:37:57 tom Exp $")

 
 static int
 _nc_vdisable(void)
 
 static int
 _nc_vdisable(void)


@@ -59,7 +60,7 @@ _nc_vdisable(void)
 #endif
 #if defined(_PC_VDISABLE)
     if (value == -1) {
 #endif
 #if defined(_PC_VDISABLE)
     if (value == -1) {

-       value = fpathconf(0, _PC_VDISABLE);
+       value = (int) fpathconf(0, _PC_VDISABLE);

        if (value == -1) {
            value = 0377;
        }
        if (value == -1) {
            value = 0377;
        }


@@ -84,18 +85,20 @@ NCURSES_SP_NAME(erasechar) (NCURSES_SP_DCL0)
     int result = ERR;
     TERMINAL *termp = TerminalOf(SP_PARM);
 
     int result = ERR;
     TERMINAL *termp = TerminalOf(SP_PARM);
 

-    T((T_CALLED("erasechar(%p)"), SP_PARM));
+    T((T_CALLED("erasechar(%p)"), (void *) SP_PARM));

 
     if (termp != 0) {
 #ifdef TERMIOS
        result = termp->Ottyb.c_cc[VERASE];
        if (result == _nc_vdisable())
            result = ERR;
 
     if (termp != 0) {
 #ifdef TERMIOS
        result = termp->Ottyb.c_cc[VERASE];
        if (result == _nc_vdisable())
            result = ERR;

+#elif defined(EXP_WIN32_DRIVER)
+       result = ERR;

 #else
        result = termp->Ottyb.sg_erase;
 #endif
     }
 #else
        result = termp->Ottyb.sg_erase;
 #endif
     }

-    returnCode(result);
+    returnChar((char) result);

 }
 
 #if NCURSES_SP_FUNCS
 }
 
 #if NCURSES_SP_FUNCS


@@ -119,18 +122,20 @@ NCURSES_SP_NAME(killchar) (NCURSES_SP_DCL0)
     int result = ERR;
     TERMINAL *termp = TerminalOf(SP_PARM);
 
     int result = ERR;
     TERMINAL *termp = TerminalOf(SP_PARM);
 

-    T((T_CALLED("killchar(%p)"), SP_PARM));
+    T((T_CALLED("killchar(%p)"), (void *) SP_PARM));

 
     if (termp != 0) {
 #ifdef TERMIOS
        result = termp->Ottyb.c_cc[VKILL];
        if (result == _nc_vdisable())
            result = ERR;
 
     if (termp != 0) {
 #ifdef TERMIOS
        result = termp->Ottyb.c_cc[VKILL];
        if (result == _nc_vdisable())
            result = ERR;

+#elif defined(EXP_WIN32_DRIVER)
+       result = ERR;

 #else
        result = termp->Ottyb.sg_kill;
 #endif
     }
 #else
        result = termp->Ottyb.sg_kill;
 #endif
     }

-    returnCode(result);
+    returnChar((char) result);

 }
 
 #if NCURSES_SP_FUNCS
 }
 
 #if NCURSES_SP_FUNCS


@@ -153,7 +158,7 @@ NCURSES_SP_NAME(flushinp) (NCURSES_SP_DCL0)
 {
     TERMINAL *termp = TerminalOf(SP_PARM);
 
 {
     TERMINAL *termp = TerminalOf(SP_PARM);
 

-    T((T_CALLED("flushinp(%p)"), SP_PARM));
+    T((T_CALLED("flushinp(%p)"), (void *) SP_PARM));

 
     if (termp != 0) {
 #ifdef TERMIOS
 
     if (termp != 0) {
 #ifdef TERMIOS


@@ -161,7 +166,11 @@ NCURSES_SP_NAME(flushinp) (NCURSES_SP_DCL0)
 #else
        errno = 0;
        do {
 #else
        errno = 0;
        do {

+#if defined(EXP_WIN32_DRIVER)
+           _nc_console_flush(_nc_console_fd2handle(termp->Filedes));
+#else

            ioctl(termp->Filedes, TIOCFLUSH, 0);
            ioctl(termp->Filedes, TIOCFLUSH, 0);

+#endif

        } while
            (errno == EINTR);
 #endif
        } while
            (errno == EINTR);
 #endif