diff --git a/winsup/cygwin/release/2.11.0 b/winsup/cygwin/release/2.11.0 index 9e73e0acb..85cf8b2d6 100644 --- a/winsup/cygwin/release/2.11.0 +++ b/winsup/cygwin/release/2.11.0 @@ -44,3 +44,6 @@ Bug Fixes - Handle a non-standard return value from some tape drives to report a "no-media" error. Addresses: https://cygwin.com/ml/cygwin/2018-06/msg00245.html + +- Fix duration handling in sigtimedwait + Addresses: https://cygwin.com/ml/cygwin-patches/2018-q3/msg00018.html diff --git a/winsup/cygwin/signal.cc b/winsup/cygwin/signal.cc index e581d28da..de3e88697 100644 --- a/winsup/cygwin/signal.cc +++ b/winsup/cygwin/signal.cc @@ -640,6 +640,8 @@ sigtimedwait (const sigset_t *set, siginfo_t *info, const timespec *timeout) waittime.QuadPart = (LONGLONG) timeout->tv_sec * NS100PERSEC + ((LONGLONG) timeout->tv_nsec + (NSPERSEC/NS100PERSEC) - 1) / (NSPERSEC/NS100PERSEC); + /* negate waittime to code as duration for NtSetTimer() below cygwait() */ + waittime.QuadPart = -waittime.QuadPart; } return sigwait_common (set, info, timeout ? &waittime : cw_infinite);