diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2015-02-23 16:32:16 +0300 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2015-02-23 16:32:16 +0300 |
| commit | b6e4adaaf1a4248907844a32fa300ee95e71bd3c (patch) | |
| tree | 1f6d0e26fd6f9928f815db10bda9b4d995785255 | |
| parent | f6ec73c0185087197e08fcaf6c58fd1e1b422da4 (diff) | |
* cygwait.cc (cygwait): Move setting res to WAIT_SIGNALED to clarify
when WAIT_SIGNALED is returned to the caller.
| -rw-r--r-- | winsup/cygwin/ChangeLog | 5 | ||||
| -rw-r--r-- | winsup/cygwin/cygwait.cc | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index bf78e2a98..a4bb6787b 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,5 +1,10 @@ 2015-02-23 Corinna Vinschen <corinna@vinschen.de> + * cygwait.cc (cygwait): Move setting res to WAIT_SIGNALED to clarify + when WAIT_SIGNALED is returned to the caller. + +2015-02-23 Corinna Vinschen <corinna@vinschen.de> + * winsup.h (SIGTOMASK): Add cast to sigset_t to avoid int overflow. 2015-02-20 Corinna Vinschen <corinna@vinschen.de> diff --git a/winsup/cygwin/cygwait.cc b/winsup/cygwin/cygwait.cc index b6bffa27f..4d2b8a745 100644 --- a/winsup/cygwin/cygwait.cc +++ b/winsup/cygwin/cygwait.cc @@ -1,6 +1,6 @@ /* cygwait.h - Copyright 2011, 2012, 2013 Red Hat, Inc. + Copyright 2011, 2012, 2013, 2015 Red Hat, Inc. This file is part of Cygwin. @@ -87,9 +87,10 @@ cygwait (HANDLE object, PLARGE_INTEGER timeout, unsigned mask) if (!sig) continue; if (is_cw_sig_eintr || (is_cw_sig_cont && sig == SIGCONT)) - res = WAIT_SIGNALED; /* caller will deal with signals */ + ; else if (_my_tls.call_signal_handler ()) continue; + res = WAIT_SIGNALED; /* caller will deal with signals */ } break; } |