diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2015-03-25 17:21:38 +0100 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2015-04-23 21:57:07 +0200 |
| commit | 03d5584c4bd296872f4c1dd3fa930ecdffc581a6 (patch) | |
| tree | 53ef8b663489156765dec7247e7fd77131cae77a | |
| parent | e6c735f685b378973d321ca53e7bdfb74fdf874e (diff) | |
| download | cygnal-03d5584c4bd296872f4c1dd3fa930ecdffc581a6.tar.gz cygnal-03d5584c4bd296872f4c1dd3fa930ecdffc581a6.tar.bz2 cygnal-03d5584c4bd296872f4c1dd3fa930ecdffc581a6.zip | |
Add CMIN and CTIME definitions
* include/sys/termios.h: Add CMIN and CTIME.
* fhandler_termios.cc (fhandler_termios::tcinit): Use CMIN and CTIME.
Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
| -rw-r--r-- | winsup/cygwin/ChangeLog | 5 | ||||
| -rw-r--r-- | winsup/cygwin/fhandler_termios.cc | 6 | ||||
| -rw-r--r-- | winsup/cygwin/include/sys/termios.h | 4 |
3 files changed, 11 insertions, 4 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 1ba89c69f..00f8d8465 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,8 @@ +2015-03-25 Corinna Vinschen <corinna@vinschen.de> + + * include/sys/termios.h: Add CMIN and CTIME. + * fhandler_termios.cc (fhandler_termios::tcinit): Use CMIN and CTIME. + 2015-03-25 Takashi Yano <takashi.yano@nifty.ne.jp> * tty.h (class tty_min): Remove variable "write_error" to which any diff --git a/winsup/cygwin/fhandler_termios.cc b/winsup/cygwin/fhandler_termios.cc index 99b661eee..983e2f99e 100644 --- a/winsup/cygwin/fhandler_termios.cc +++ b/winsup/cygwin/fhandler_termios.cc @@ -1,7 +1,7 @@ /* fhandler_termios.cc Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2008, 2009, 2010, - 2011, 2012, 2014 Red Hat, Inc. + 2011, 2012, 2014, 2015 Red Hat, Inc. This file is part of Cygwin. @@ -46,14 +46,14 @@ fhandler_termios::tcinit (bool is_pty_master) tc ()->ti.c_cc[VINTR] = CINTR; tc ()->ti.c_cc[VKILL] = CKILL; tc ()->ti.c_cc[VLNEXT] = CLNEXT; - tc ()->ti.c_cc[VMIN] = 1; + tc ()->ti.c_cc[VMIN] = CMIN; tc ()->ti.c_cc[VQUIT] = CQUIT; tc ()->ti.c_cc[VREPRINT] = CRPRNT; tc ()->ti.c_cc[VSTART] = CSTART; tc ()->ti.c_cc[VSTOP] = CSTOP; tc ()->ti.c_cc[VSUSP] = CSUSP; tc ()->ti.c_cc[VSWTC] = CSWTCH; - tc ()->ti.c_cc[VTIME] = 0; + tc ()->ti.c_cc[VTIME] = CTIME; tc ()->ti.c_cc[VWERASE] = CWERASE; tc ()->ti.c_ispeed = tc ()->ti.c_ospeed = B38400; diff --git a/winsup/cygwin/include/sys/termios.h b/winsup/cygwin/include/sys/termios.h index 687c0085e..fb6f3851b 100644 --- a/winsup/cygwin/include/sys/termios.h +++ b/winsup/cygwin/include/sys/termios.h @@ -1,7 +1,7 @@ /* sys/termios.h Copyright 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, - 2008, 2009, 2010, 2011, 2012 Red Hat, Inc. + 2008, 2009, 2010, 2011, 2012, 2015 Red Hat, Inc. This file is part of Cygwin. @@ -99,6 +99,8 @@ POSIX commands */ #define CDISCARD CFLUSH #define CWERASE CTRL('W') #define CLNEXT CTRL('V') +#define CMIN 1 +#define CTIME 0 /* iflag bits */ #define IGNBRK 0x00001 |