ncurses 5.7 - patch 20100501

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

diff --git a/ncurses/tinfo/lib_baudrate.c b/ncurses/tinfo/lib_baudrate.c
index 72818e2cf04ae9fe6d2c20cb8068b547cb574292..854442a943a3bc8745274fc37deb6acf4c4b22a2 100644 (file)
--- a/ncurses/tinfo/lib_baudrate.c
+++ b/ncurses/tinfo/lib_baudrate.c
@@ -38,7 +38,6 @@
  */
 
 #include <curses.priv.h>
  */
 
 #include <curses.priv.h>

-#include <term.h>              /* cur_term, pad_char */

 #include <termcap.h>           /* ospeed */
 #if defined(__FreeBSD__)
 #include <sys/param.h>
 #include <termcap.h>           /* ospeed */
 #if defined(__FreeBSD__)
 #include <sys/param.h>


@@ -80,7 +79,7 @@
 #undef USE_OLD_TTY
 #endif /* USE_OLD_TTY */
 
 #undef USE_OLD_TTY
 #endif /* USE_OLD_TTY */
 

-MODULE_ID("$Id: lib_baudrate.c,v 1.28 2009/02/14 21:41:22 tom Exp $")
+MODULE_ID("$Id: lib_baudrate.c,v 1.30 2009/10/24 22:15:00 tom Exp $")

 
 /*
  *     int
 
 /*
  *     int


@@ -199,7 +198,7 @@ NCURSES_SP_NAME(baudrate) (NCURSES_SP_DCL0)
 {
     int result;
 
 {
     int result;
 

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

 
     /*
      * In debugging, allow the environment symbol to override when we're
 
     /*
      * In debugging, allow the environment symbol to override when we're


@@ -207,7 +206,8 @@ NCURSES_SP_NAME(baudrate) (NCURSES_SP_DCL0)
      * that take into account costs that depend on baudrate.
      */
 #ifdef TRACE
      * that take into account costs that depend on baudrate.
      */
 #ifdef TRACE

-    if (!isatty(fileno(SP_PARM ? SP_PARM->_ofp : stdout))
+    if (IsValidTIScreen(SP_PARM)
+       && !isatty(fileno(SP_PARM ? SP_PARM->_ofp : stdout))

        && getenv("BAUDRATE") != 0) {
        int ret;
        if ((ret = _nc_getenv_num("BAUDRATE")) <= 0)
        && getenv("BAUDRATE") != 0) {
        int ret;
        if ((ret = _nc_getenv_num("BAUDRATE")) <= 0)


@@ -217,19 +217,19 @@ NCURSES_SP_NAME(baudrate) (NCURSES_SP_DCL0)
     }
 #endif
 
     }
 #endif
 

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

 #ifdef USE_OLD_TTY
 #ifdef USE_OLD_TTY

-       result = cfgetospeed(&cur_term->Nttyb);
+       result = cfgetospeed(&(TerminalOf(SP_PARM)->Nttyb));

        ospeed = _nc_ospeed(result);
 #else /* !USE_OLD_TTY */
 #ifdef TERMIOS
        ospeed = _nc_ospeed(result);
 #else /* !USE_OLD_TTY */
 #ifdef TERMIOS

-       ospeed = cfgetospeed(&cur_term->Nttyb);
+       ospeed = cfgetospeed(&(TerminalOf(SP_PARM)->Nttyb));

 #else
 #else

-       ospeed = cur_term->Nttyb.sg_ospeed;
+       ospeed = TerminalOf(SP_PARM)->Nttyb.sg_ospeed;

 #endif
        result = _nc_baudrate(ospeed);
 #endif
 #endif
        result = _nc_baudrate(ospeed);
 #endif

-       cur_term->_baudrate = result;
+       TerminalOf(SP_PARM)->_baudrate = result;

     } else {
        result = ERR;
     }
     } else {
        result = ERR;
     }