ncurses 5.6 - patch 20070929

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

diff --git a/ncurses/tinfo/lib_kernel.c b/ncurses/tinfo/lib_kernel.c
index 3c8c88ee2aabcac7af1a880915407029d0ddad0d..89dc1e80ea8ec39bfb05ac982299f7f84fd73ac4 100644 (file)
--- a/ncurses/tinfo/lib_kernel.c
+++ b/ncurses/tinfo/lib_kernel.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998 Free Software Foundation, Inc.                        *
+ * Copyright (c) 1998-2003,2004 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            *


@@ -29,9 +29,9 @@
 /****************************************************************************
  *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
 /****************************************************************************
  *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *

+ *     and: Thomas E. Dickey 2002                                           *

  ****************************************************************************/
 
  ****************************************************************************/
 

-

 /*
  *     lib_kernel.c
  *
 /*
  *     lib_kernel.c
  *


@@ -46,9 +46,30 @@
  */
 
 #include <curses.priv.h>
  */
 
 #include <curses.priv.h>

-#include <term.h>      /* cur_term */
+#include <term.h>              /* cur_term */
+
+MODULE_ID("$Id: lib_kernel.c,v 1.24 2004/05/08 17:11:21 tom Exp $")

 
 

-MODULE_ID("$Id: lib_kernel.c,v 1.19 1998/12/20 00:18:45 tom Exp $")
+static int
+_nc_vdisable(void)
+{
+    int value = -1;
+#if defined(_POSIX_VDISABLE) && HAVE_UNISTD_H
+    value = _POSIX_VDISABLE;
+#endif
+#if defined(_PC_VDISABLE)
+    if (value == -1) {
+       value = fpathconf(0, _PC_VDISABLE);
+       if (value == -1) {
+           value = 0377;
+       }
+    }
+#elif defined(VDISABLE)
+    if (value == -1)
+       value = VDISABLE;
+#endif
+    return value;
+}

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


@@ -57,23 +78,24 @@ MODULE_ID("$Id: lib_kernel.c,v 1.19 1998/12/20 00:18:45 tom Exp $")
  *
  */
 
  *
  */
 

-char
+NCURSES_EXPORT(char)

 erasechar(void)
 {
 erasechar(void)
 {

-       T((T_CALLED("erasechar()")));
+    int result = ERR;
+    T((T_CALLED("erasechar()")));

 
 

-       if (cur_term != 0) {
+    if (cur_term != 0) {

 #ifdef TERMIOS
 #ifdef TERMIOS

-               returnCode(cur_term->Ottyb.c_cc[VERASE]);
+       result = cur_term->Ottyb.c_cc[VERASE];
+       if (result == _nc_vdisable())
+           result = ERR;

 #else
 #else

-               returnCode(cur_term->Ottyb.sg_erase);
+       result = cur_term->Ottyb.sg_erase;

 #endif
 #endif

-       }
-       returnCode(ERR);
+    }
+    returnCode(result);

 }
 
 }
 

-
-

 /*
  *     killchar()
  *
 /*
  *     killchar()
  *


@@ -81,23 +103,24 @@ erasechar(void)
  *
  */
 
  *
  */
 

-char
+NCURSES_EXPORT(char)

 killchar(void)
 {
 killchar(void)
 {

-       T((T_CALLED("killchar()")));
+    int result = ERR;
+    T((T_CALLED("killchar()")));

 
 

-       if (cur_term != 0) {
+    if (cur_term != 0) {

 #ifdef TERMIOS
 #ifdef TERMIOS

-               returnCode(cur_term->Ottyb.c_cc[VKILL]);
+       result = cur_term->Ottyb.c_cc[VKILL];
+       if (result == _nc_vdisable())
+           result = ERR;

 #else
 #else

-               returnCode(cur_term->Ottyb.sg_kill);
+       result = cur_term->Ottyb.sg_kill;

 #endif
 #endif

-       }
-       returnCode(ERR);
+    }
+    returnCode(result);

 }
 
 }
 

-
-

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


@@ -105,26 +128,27 @@ killchar(void)
  *
  */
 
  *
  */
 

-int flushinp(void)
+NCURSES_EXPORT(int)
+flushinp(void)

 {
 {

-       T((T_CALLED("flushinp()")));
+    T((T_CALLED("flushinp()")));

 
 

-       if (cur_term != 0) {
+    if (cur_term != 0) {

 #ifdef TERMIOS
 #ifdef TERMIOS

-               tcflush(cur_term->Filedes, TCIFLUSH);
+       tcflush(cur_term->Filedes, TCIFLUSH);

 #else
 #else

-               errno = 0;
-               do {
-                   ioctl(cur_term->Filedes, TIOCFLUSH, 0);
-               } while
-                   (errno == EINTR);
+       errno = 0;
+       do {
+           ioctl(cur_term->Filedes, TIOCFLUSH, 0);
+       } while
+           (errno == EINTR);

 #endif
 #endif

-               if (SP) {
-                       SP->_fifohead = -1;
-                       SP->_fifotail = 0;
-                       SP->_fifopeek = 0;
-               }
-               returnCode(OK);
+       if (SP) {
+           SP->_fifohead = -1;
+           SP->_fifotail = 0;
+           SP->_fifopeek = 0;

        }
        }

-       returnCode(ERR);
+       returnCode(OK);
+    }
+    returnCode(ERR);

 }
 }