* fhandler_tty.cc (fhandler_pty_slave::read): Having no input is not an
error condition for tcflush.
This commit is contained in:
		| @@ -1,3 +1,15 @@ | |||||||
|  | 2015-02-25  Corinna Vinschen  <corinna@vinschen.de> | ||||||
|  |  | ||||||
|  | 	* fhandler_tty.cc (fhandler_pty_slave::read): Having no input is not an | ||||||
|  | 	error condition for tcflush. | ||||||
|  |  | ||||||
|  | 2015-02-25  Corinna Vinschen  <corinna@vinschen.de> | ||||||
|  |  | ||||||
|  | 	* fhandler_tape.cc (fhandler_dev_tape::_lock): Add cw_sig_restart to | ||||||
|  | 	cygwait call. | ||||||
|  | 	* thread.cc (pthread_mutex::lock): Ditto. | ||||||
|  | 	* thread.h (fast_mutex::lock): Ditto. | ||||||
|  |  | ||||||
| 2015-02-25  Corinna Vinschen  <corinna@vinschen.de> | 2015-02-25  Corinna Vinschen  <corinna@vinschen.de> | ||||||
|  |  | ||||||
| 	* security.cc (alloc_sd): Fix comment style.  Remove code unused for | 	* security.cc (alloc_sd): Fix comment style.  Remove code unused for | ||||||
|   | |||||||
| @@ -1,7 +1,7 @@ | |||||||
| /* fhandler_tty.cc | /* fhandler_tty.cc | ||||||
|  |  | ||||||
|    Copyright 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, |    Copyright 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, | ||||||
|    2008, 2009, 2010, 2011, 2012, 2013 Red Hat, Inc. |    2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Red Hat, Inc. | ||||||
|  |  | ||||||
| This file is part of Cygwin. | This file is part of Cygwin. | ||||||
|  |  | ||||||
| @@ -755,7 +755,8 @@ fhandler_pty_slave::read (void *ptr, size_t& len) | |||||||
| 	  /*NOTREACHED*/ | 	  /*NOTREACHED*/ | ||||||
| 	case WAIT_TIMEOUT: | 	case WAIT_TIMEOUT: | ||||||
| 	  termios_printf ("wait timed out, time_to_wait %u", time_to_wait); | 	  termios_printf ("wait timed out, time_to_wait %u", time_to_wait); | ||||||
| 	  if (!totalread) | 	  /* No error condition when called from tcflush. */ | ||||||
|  | 	  if (!totalread && ptr) | ||||||
| 	    { | 	    { | ||||||
| 	      set_sig_errno (EAGAIN); | 	      set_sig_errno (EAGAIN); | ||||||
| 	      totalread = -1; | 	      totalread = -1; | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user