summaryrefslogtreecommitdiffstats
path: root/winsup
diff options
context:
space:
mode:
authorChristopher Faylor <me@cgf.cx>2005-09-09 02:53:40 +0000
committerChristopher Faylor <me@cgf.cx>2005-09-09 02:53:40 +0000
commitc0df672fa07d54e1dae5fd3b41f5a704e9080801 (patch)
tree98b0d0ce9dffc796f5ac27ca75eb0a901d3a028b /winsup
parentb10ab72581173784a6687739e44c02d940e009c9 (diff)
downloadcygnal-c0df672fa07d54e1dae5fd3b41f5a704e9080801.tar.gz
cygnal-c0df672fa07d54e1dae5fd3b41f5a704e9080801.tar.bz2
cygnal-c0df672fa07d54e1dae5fd3b41f5a704e9080801.zip
* fhandler_serial.cc (fhandler_serial::ioctl): Always return 0 for window size.
* termios.cc (tcgetattr): Clear out baud part of c_cflag since it is always ignored.
Diffstat (limited to 'winsup')
-rw-r--r--winsup/cygwin/ChangeLog7
-rw-r--r--winsup/cygwin/fhandler_serial.cc4
-rw-r--r--winsup/cygwin/termios.cc5
3 files changed, 15 insertions, 1 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 8ad741b98..4ad6347a2 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,10 @@
+2005-09-08 Christopher Faylor <cgf@timesys.com>
+
+ * fhandler_serial.cc (fhandler_serial::ioctl): Always return 0 for
+ window size.
+ * termios.cc (tcgetattr): Clear out baud part of c_cflag since it is
+ always ignored.
+
2005-09-08 Corinna Vinschen <corinna@vinschen.de>
* exceptions.cc (ctrl_c_handler): Disable any special CTRL_LOGOFF_EVENT
diff --git a/winsup/cygwin/fhandler_serial.cc b/winsup/cygwin/fhandler_serial.cc
index 0aefb7f83..f7f9d60be 100644
--- a/winsup/cygwin/fhandler_serial.cc
+++ b/winsup/cygwin/fhandler_serial.cc
@@ -517,6 +517,10 @@ fhandler_serial::ioctl (unsigned int cmd, void *buffer)
else
ipbuffer = st.cbInQue;
break;
+ case TIOCGWINSZ:
+ ((struct winsize *) buffer)->ws_row = 0;
+ ((struct winsize *) buffer)->ws_col = 0;
+ break;
default:
set_errno (ENOSYS);
res = -1;
diff --git a/winsup/cygwin/termios.cc b/winsup/cygwin/termios.cc
index 6e0ab3e9f..e6a6517f2 100644
--- a/winsup/cygwin/termios.cc
+++ b/winsup/cygwin/termios.cc
@@ -179,7 +179,10 @@ tcgetattr (int fd, struct termios *in_t)
else if (!cfd->is_tty ())
set_errno (ENOTTY);
else if ((res = cfd->tcgetattr (t)) == 0)
- __toapp_termios (in_t, t);
+ {
+ t->c_cflag &= ~CBAUD;
+ __toapp_termios (in_t, t);
+ }
if (res)
termios_printf ("%d = tcgetattr (%d, %p)", res, fd, in_t);