ncurses 6.0 - patch 20170311

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

diff --git a/ncurses/tinfo/lib_baudrate.c b/ncurses/tinfo/lib_baudrate.c
index 1cf5505c4fa62287a1816a38438fcb4bf3f10f70..3430477df712e7d6e53a8030370868010061b6d4 100644 (file)
--- a/ncurses/tinfo/lib_baudrate.c
+++ b/ncurses/tinfo/lib_baudrate.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

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


@@ -39,7 +39,7 @@
 
 #include <curses.priv.h>
 #include <termcap.h>           /* ospeed */
 
 #include <curses.priv.h>
 #include <termcap.h>           /* ospeed */

-#if defined(__FreeBSD__)
+#if defined(__FreeBSD__) || defined(__OpenBSD__)

 #include <sys/param.h>
 #endif
 
 #include <sys/param.h>
 #endif
 


@@ -49,7 +49,11 @@
  * of the indices up to B115200 fit nicely in a 'short', allowing us to retain
  * ospeed's type for compatibility.
  */
  * of the indices up to B115200 fit nicely in a 'short', allowing us to retain
  * ospeed's type for compatibility.
  */

-#if NCURSES_OSPEED_COMPAT && ((defined(__FreeBSD__) && (__FreeBSD_version < 700000)) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__APPLE__))
+#if NCURSES_OSPEED_COMPAT && \
+       ((defined(__FreeBSD__) && (__FreeBSD_version < 700000)) || \
+       defined(__NetBSD__) || \
+       ((defined(__OpenBSD__) && OpenBSD < 201510)) || \
+       defined(__APPLE__))

 #undef B0
 #undef B50
 #undef B75
 #undef B0
 #undef B50
 #undef B75


@@ -79,7 +83,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.37 2015/06/14 00:34:12 tom Exp $")
+MODULE_ID("$Id: lib_baudrate.c,v 1.42 2016/10/03 00:29:21 tom Exp $")

 
 /*
  *     int
 
 /*
  *     int


@@ -90,8 +94,8 @@ MODULE_ID("$Id: lib_baudrate.c,v 1.37 2015/06/14 00:34:12 tom Exp $")
  */
 
 struct speed {
  */
 
 struct speed {

-    NCURSES_OSPEED s;          /* values for 'ospeed' */
-    int sp;                    /* the actual speed */
+    int given_speed;           /* values for 'ospeed' */
+    int actual_speed;          /* the actual speed */

 };
 
 #define DATA(number) { B##number, number }
 };
 
 #define DATA(number) { B##number, number }


@@ -117,6 +121,9 @@ static struct speed const speeds[] =
 #elif defined(EXTA)
     {EXTA, 19200},
 #endif
 #elif defined(EXTA)
     {EXTA, 19200},
 #endif

+#ifdef B28800
+    DATA(28800),
+#endif

 #ifdef B38400
     DATA(38400),
 #elif defined(EXTB)
 #ifdef B38400
     DATA(38400),
 #elif defined(EXTB)


@@ -127,18 +134,57 @@ static struct speed const speeds[] =
 #endif
     /* ifdef to prevent overflow when OLD_TTY is not available */
 #if !(NCURSES_OSPEED_COMPAT && defined(__FreeBSD__) && (__FreeBSD_version > 700000))
 #endif
     /* ifdef to prevent overflow when OLD_TTY is not available */
 #if !(NCURSES_OSPEED_COMPAT && defined(__FreeBSD__) && (__FreeBSD_version > 700000))

+#ifdef B76800
+    DATA(76800),
+#endif

 #ifdef B115200
     DATA(115200),
 #endif
 #ifdef B115200
     DATA(115200),
 #endif

+#ifdef B153600
+    DATA(153600),
+#endif

 #ifdef B230400
     DATA(230400),
 #endif
 #ifdef B230400
     DATA(230400),
 #endif

+#ifdef B307200
+    DATA(307200),
+#endif

 #ifdef B460800
     DATA(460800),
 #endif
 #ifdef B460800
     DATA(460800),
 #endif

+#ifdef B500000
+    DATA(500000),
+#endif
+#ifdef B576000
+    DATA(576000),
+#endif

 #ifdef B921600
     DATA(921600),
 #endif
 #ifdef B921600
     DATA(921600),
 #endif

+#ifdef B1000000
+    DATA(1000000),
+#endif
+#ifdef B1152000
+    DATA(1152000),
+#endif
+#ifdef B1500000
+    DATA(1500000),
+#endif
+#ifdef B2000000
+    DATA(2000000),
+#endif
+#ifdef B2500000
+    DATA(2500000),
+#endif
+#ifdef B3000000
+    DATA(3000000),
+#endif
+#ifdef B3500000
+    DATA(3500000),
+#endif
+#ifdef B4000000
+    DATA(4000000),
+#endif

 #endif
 };
 
 #endif
 };
 


@@ -151,8 +197,11 @@ _nc_baudrate(int OSpeed)
 #endif
 
     int result = ERR;
 #endif
 
     int result = ERR;

-    unsigned i;

 
 

+    if (OSpeed < 0)
+       OSpeed = (NCURSES_OSPEED) OSpeed;
+    if (OSpeed < 0)
+       OSpeed = (unsigned short) OSpeed;

 #if !USE_REENTRANT
     if (OSpeed == last_OSpeed) {
        result = last_baudrate;
 #if !USE_REENTRANT
     if (OSpeed == last_OSpeed) {
        result = last_baudrate;


@@ -160,9 +209,14 @@ _nc_baudrate(int OSpeed)
 #endif
     if (result == ERR) {
        if (OSpeed >= 0) {
 #endif
     if (result == ERR) {
        if (OSpeed >= 0) {

+           unsigned i;
+

            for (i = 0; i < SIZEOF(speeds); i++) {
            for (i = 0; i < SIZEOF(speeds); i++) {

-               if ((int) speeds[i].s == OSpeed) {
-                   result = speeds[i].sp;
+               if (speeds[i].given_speed > OSpeed) {
+                   break;
+               }
+               if (speeds[i].given_speed == OSpeed) {
+                   result = speeds[i].actual_speed;

                    break;
                }
            }
                    break;
                }
            }


@@ -181,12 +235,13 @@ NCURSES_EXPORT(int)
 _nc_ospeed(int BaudRate)
 {
     int result = 1;
 _nc_ospeed(int BaudRate)
 {
     int result = 1;

-    unsigned i;

 
     if (BaudRate >= 0) {
 
     if (BaudRate >= 0) {

+       unsigned i;
+

        for (i = 0; i < SIZEOF(speeds); i++) {
        for (i = 0; i < SIZEOF(speeds); i++) {

-           if (speeds[i].sp == BaudRate) {
-               result = speeds[i].s;
+           if (speeds[i].actual_speed == BaudRate) {
+               result = speeds[i].given_speed;

                break;
            }
        }
                break;
            }
        }