summaryrefslogtreecommitdiff
path: root/lib/libcurses/tinfo
diff options
context:
space:
mode:
authorChristian Weisgerber <naddy@cvs.openbsd.org>2013-12-10 20:33:52 +0000
committerChristian Weisgerber <naddy@cvs.openbsd.org>2013-12-10 20:33:52 +0000
commitcafac3cdba7c1f82f1cf4f8c1fbaf0f307d954a5 (patch)
tree7786dc5488123ffa230ea00b61e1cd1bef4ffa63 /lib/libcurses/tinfo
parent9161399ddeec8c9f32f47a1a521da4d510427ec8 (diff)
Disable the USE_OLD_TTY hack that re-encoded termios Bnnn speeds
as sgtty Bnnn speeds. This means ospeed has to grow from short to int to hold all possible values. Bump major version. While there, also fix a bug in _nc_baudrate(). ok nicm@, millert@, deraadt@
Diffstat (limited to 'lib/libcurses/tinfo')
-rw-r--r--lib/libcurses/tinfo/lib_baudrate.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/libcurses/tinfo/lib_baudrate.c b/lib/libcurses/tinfo/lib_baudrate.c
index a171993945a..fffd5720bd9 100644
--- a/lib/libcurses/tinfo/lib_baudrate.c
+++ b/lib/libcurses/tinfo/lib_baudrate.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: lib_baudrate.c,v 1.5 2010/01/12 23:22:06 nicm Exp $ */
+/* $OpenBSD: lib_baudrate.c,v 1.6 2013/12/10 20:33:51 naddy Exp $ */
/****************************************************************************
* Copyright (c) 1998-2007,2008 Free Software Foundation, Inc. *
@@ -52,7 +52,7 @@
* of the indices up to B115200 fit nicely in a 'short', allowing us to retain
* ospeed's type for compatibility.
*/
-#if (defined(__FreeBSD__) && (__FreeBSD_version < 700000)) || defined(__NetBSD__) || defined(__OpenBSD__)
+#if (defined(__FreeBSD__) && (__FreeBSD_version < 700000)) || defined(__NetBSD__)
#undef B0
#undef B50
#undef B75
@@ -82,7 +82,7 @@
#undef USE_OLD_TTY
#endif /* USE_OLD_TTY */
-MODULE_ID("$Id: lib_baudrate.c,v 1.5 2010/01/12 23:22:06 nicm Exp $")
+MODULE_ID("$Id: lib_baudrate.c,v 1.6 2013/12/10 20:33:51 naddy Exp $")
/*
* int
@@ -170,7 +170,7 @@ _nc_baudrate(int OSpeed)
}
}
#if !USE_REENTRANT
- if (OSpeed == last_OSpeed) {
+ if (OSpeed != last_OSpeed) {
last_OSpeed = OSpeed;
last_baudrate = result;
}