ncurses 5.6 - patch 20080927

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

diff --git a/ncurses/tinfo/lib_baudrate.c b/ncurses/tinfo/lib_baudrate.c
index ccf5935c19ba932b982195509e2757b0dcdd7c84..b9cdfda9acced7bebc28da3b3add4be759651177 100644 (file)
--- a/ncurses/tinfo/lib_baudrate.c
+++ b/ncurses/tinfo/lib_baudrate.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998-2002,2006 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2007,2008 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            *
@@ -40,6 +40,9 @@
 #include <curses.priv.h>
 #include <term.h>              /* cur_term, pad_char */
 #include <termcap.h>           /* ospeed */
+#if defined(__FreeBSD__)
+#include <sys/param.h>
+#endif
 
 /*
  * These systems use similar header files, which define B1200 as 1200, etc.,
@@ -47,7 +50,7 @@
  * of the indices up to B115200 fit nicely in a 'short', allowing us to retain
  * ospeed's type for compatibility.
  */
-#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
+#if (defined(__FreeBSD__) && (__FreeBSD_version < 700000)) || defined(__NetBSD__) || defined(__OpenBSD__)
 #undef B0
 #undef B50
 #undef B75
@@ -77,7 +80,7 @@
 #undef USE_OLD_TTY
 #endif /* USE_OLD_TTY */
 
-MODULE_ID("$Id: lib_baudrate.c,v 1.23 2006/12/30 18:06:16 tom Exp $")
+MODULE_ID("$Id: lib_baudrate.c,v 1.27 2008/06/28 15:19:24 tom Exp $")
 
 /*
  *     int
@@ -142,7 +145,7 @@ static struct speed const speeds[] =
 NCURSES_EXPORT(int)
 _nc_baudrate(int OSpeed)
 {
-#ifndef _REENTRANT
+#if !USE_REENTRANT
     static int last_OSpeed;
     static int last_baudrate;
 #endif
@@ -150,7 +153,7 @@ _nc_baudrate(int OSpeed)
     int result = ERR;
     unsigned i;
 
-#ifndef _REENTRANT
+#if !USE_REENTRANT
     if (OSpeed == last_OSpeed) {
        result = last_baudrate;
     }
@@ -164,7 +167,7 @@ _nc_baudrate(int OSpeed)
                }
            }
        }
-#ifndef _REENTRANT
+#if !USE_REENTRANT
        if (OSpeed == last_OSpeed) {
            last_OSpeed = OSpeed;
            last_baudrate = result;
@@ -204,7 +207,7 @@ baudrate(void)
      * that take into account costs that depend on baudrate.
      */
 #ifdef TRACE
-    if (SP && !isatty(fileno(SP->_ofp))
+    if (!isatty(fileno(SP ? SP->_ofp : stdout))
        && getenv("BAUDRATE") != 0) {
        int ret;
        if ((ret = _nc_getenv_num("BAUDRATE")) <= 0)
@@ -214,19 +217,22 @@ baudrate(void)
     }
 #endif
 
+    if (cur_term != 0) {
 #ifdef USE_OLD_TTY
-    result = cfgetospeed(&cur_term->Nttyb);
-    ospeed = _nc_ospeed(result);
+       result = cfgetospeed(&cur_term->Nttyb);
+       ospeed = _nc_ospeed(result);
 #else /* !USE_OLD_TTY */
 #ifdef TERMIOS
-    ospeed = cfgetospeed(&cur_term->Nttyb);
+       ospeed = cfgetospeed(&cur_term->Nttyb);
 #else
-    ospeed = cur_term->Nttyb.sg_ospeed;
+       ospeed = cur_term->Nttyb.sg_ospeed;
 #endif
-    result = _nc_baudrate(ospeed);
+       result = _nc_baudrate(ospeed);
 #endif
-    if (cur_term != 0)
        cur_term->_baudrate = result;
+    } else {
+       result = ERR;
+    }
 
     returnCode(result);
 }