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 482657add7cf9348f8f009498a59fbb75cd4353a..46f652b0a30a2f6d1ed0cbede036978ecebd91ea 100644 (file)
--- a/ncurses/tinfo/lib_kernel.c
+++ b/ncurses/tinfo/lib_kernel.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020 Thomas E. Dickey                                          *
+ * 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  *
@@ -49,8 +49,9 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_kernel.c,v 1.32 2020/02/02 23:34:34 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)
 {
@@ -58,7 +59,7 @@ _nc_vdisable(void)
 #if defined(_POSIX_VDISABLE) && HAVE_UNISTD_H
     value = _POSIX_VDISABLE;
 #endif
-#if defined(_PC_VDISABLE)
+#if defined(_PC_VDISABLE) && HAVE_FPATHCONF
     if (value == -1) {
        value = (int) fpathconf(0, _PC_VDISABLE);
        if (value == -1) {
@@ -71,6 +72,7 @@ _nc_vdisable(void)
 #endif
     return value;
 }
+#endif /* TERMIOS */
 
 /*
  *     erasechar()
@@ -92,6 +94,8 @@ NCURSES_SP_NAME(erasechar) (NCURSES_SP_DCL0)
        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
@@ -127,6 +131,8 @@ NCURSES_SP_NAME(killchar) (NCURSES_SP_DCL0)
        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
@@ -142,30 +148,40 @@ killchar(void)
 }
 #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()
  *
- *     Flush any input on cur_term->Filedes
- *
+ *     Flush any input on tty
  */
 
 NCURSES_EXPORT(int)
 NCURSES_SP_NAME(flushinp) (NCURSES_SP_DCL0)
 {
-    TERMINAL *termp = TerminalOf(SP_PARM);
-
     T((T_CALLED("flushinp(%p)"), (void *) 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;