diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2012-05-25 11:08:10 +0000 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2012-05-25 11:08:10 +0000 |
| commit | df5cda0e9332d5d82ccd56c781d9fbf368648933 (patch) | |
| tree | 00a4ee1ae23d61880355f2601973c3b07e0c9d49 | |
| parent | 96d5b7d17cdbbf265f3be6d5cc7894ff915bc1c3 (diff) | |
| download | cygnal-df5cda0e9332d5d82ccd56c781d9fbf368648933.tar.gz cygnal-df5cda0e9332d5d82ccd56c781d9fbf368648933.tar.bz2 cygnal-df5cda0e9332d5d82ccd56c781d9fbf368648933.zip | |
* fhandler_serial.cc (fhandler_serial::raw_read): Check for
ERROR_OPERATION_ABORTED rather than ERROR_IO_INCOMPLETE after CancelIo.
| -rw-r--r-- | winsup/cygwin/ChangeLog | 5 | ||||
| -rw-r--r-- | winsup/cygwin/fhandler_serial.cc | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index d0f613d21..56e644394 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,5 +1,10 @@ 2012-05-25 Corinna Vinschen <corinna@vinschen.de> + * fhandler_serial.cc (fhandler_serial::raw_read): Check for + ERROR_OPERATION_ABORTED rather than ERROR_IO_INCOMPLETE after CancelIo. + +2012-05-25 Corinna Vinschen <corinna@vinschen.de> + * fhandler_serial.cc (fhandler_serial::raw_read): Just call ReadFile directly in case of non-blocking I/O and handle result gracefully. diff --git a/winsup/cygwin/fhandler_serial.cc b/winsup/cygwin/fhandler_serial.cc index c58d0418c..033498742 100644 --- a/winsup/cygwin/fhandler_serial.cc +++ b/winsup/cygwin/fhandler_serial.cc @@ -128,7 +128,7 @@ fhandler_serial::raw_read (void *ptr, size_t& ulen) CancelIo (get_handle ()); if (GetOverlappedResult (get_handle (), &io_status, &n, FALSE)) tot = n; - else if (GetLastError () != ERROR_IO_INCOMPLETE) + else if (GetLastError () != ERROR_OPERATION_ABORTED) goto err; if (tot == 0) { |