ncurses 6.4 - patch 20240420

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

diff --git a/ncurses/tinfo/lib_kernel.c b/ncurses/tinfo/lib_kernel.c
index 558b20730dc17d84a01982dbce54e412104cedd3..46f652b0a30a2f6d1ed0cbede036978ecebd91ea 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-2022,2023 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,8 +49,9 @@
 
 #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.36 2023/06/10 13:29:06 tom Exp $")

 
 

+#ifdef TERMIOS

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


@@ -57,9 +59,9 @@ _nc_vdisable(void)
 #if defined(_POSIX_VDISABLE) && HAVE_UNISTD_H
     value = _POSIX_VDISABLE;
 #endif
 #if defined(_POSIX_VDISABLE) && HAVE_UNISTD_H
     value = _POSIX_VDISABLE;
 #endif

-#if defined(_PC_VDISABLE)
+#if defined(_PC_VDISABLE) && HAVE_FPATHCONF

     if (value == -1) {
     if (value == -1) {

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

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


@@ -70,6 +72,7 @@ _nc_vdisable(void)
 #endif
     return value;
 }
 #endif
     return value;
 }

+#endif /* TERMIOS */

 
 /*
  *     erasechar()
 
 /*
  *     erasechar()


@@ -84,18 +87,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 +124,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


@@ -141,30 +148,40 @@ killchar(void)
 }
 #endif
 
 }
 #endif
 

+static void
+flush_input(int fd)
+{
+#ifdef TERMIOS
+    tcflush(fd, TCIFLUSH);
+#else /* !TERMIOS */
+    errno = 0;
+    do {
+#if defined(EXP_WIN32_DRIVER)
+       _nc_console_flush(_nc_console_fd2handle(fd));
+#else
+       ioctl(fd, TIOCFLUSH, 0);
+#endif
+    } while
+       (errno == EINTR);
+#endif
+}
+

 /*
  *     flushinp()
  *
 /*
  *     flushinp()
  *

- *     Flush any input on cur_term->Filedes
- *
+ *     Flush any input on tty

  */
 
 NCURSES_EXPORT(int)
 NCURSES_SP_NAME(flushinp) (NCURSES_SP_DCL0)
 {
  */
 
 NCURSES_EXPORT(int)
 NCURSES_SP_NAME(flushinp) (NCURSES_SP_DCL0)
 {

-    TERMINAL *termp = TerminalOf(SP_PARM);
+    T((T_CALLED("flushinp(%p)"), (void *) SP_PARM));

 
 

-    T((T_CALLED("flushinp(%p)"), SP_PARM));
-
-    if (termp != 0) {
-#ifdef TERMIOS
-       tcflush(termp->Filedes, TCIFLUSH);
-#else
-       errno = 0;
-       do {
-           ioctl(termp->Filedes, TIOCFLUSH, 0);
-       } while
-           (errno == EINTR);
-#endif
+    if (SP_PARM != 0) {
+       if (NC_ISATTY(SP_PARM->_ifd))
+           flush_input(SP_PARM->_ifd);
+       else if (NC_ISATTY(SP_PARM->_ofd))
+           flush_input(SP_PARM->_ofd);

        if (SP_PARM) {
            SP_PARM->_fifohead = -1;
            SP_PARM->_fifotail = 0;
        if (SP_PARM) {
            SP_PARM->_fifohead = -1;
            SP_PARM->_fifotail = 0;