* cygwait.cc (cygwait): Move setting res to WAIT_SIGNALED to clarify

	when WAIT_SIGNALED is returned to the caller.

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index bf78e2a98c2420f8e522e9a84965d19da887558a..a4bb6787b1e36a0f5a9f91bab58dab6391a61275 100644 (file)
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+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.

diff --git a/winsup/cygwin/cygwait.cc b/winsup/cygwin/cygwait.cc
index b6bffa27f17e543b4f7fcdec63945815959c406c..4d2b8a745b2f0c7f8f1ece99fe60f7dd38cca5fa 100644 (file)
--- 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;
     }