[git] GPG-ERROR - branch, master, updated. gpgrt-1.29-6-g4f45f3e

by Werner Koch cvs at cvs.gnupg.org
Mon Apr 30 08:18:01 CEST 2018


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Error codes used by GnuPG et al.".

The branch, master has been updated
       via  4f45f3e0bb404b4a9787cb55ca154c6f60c1437b (commit)
      from  0d828dab0a0cb50e76f16b7af6ad542e1ef5a7f6 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 4f45f3e0bb404b4a9787cb55ca154c6f60c1437b
Author: Werner Koch <wk at gnupg.org>
Date:   Mon Apr 30 07:49:11 2018 +0200

    core: Fix gpgrt_poll for Windows under nPth.
    
    * src/estream.c (_gpgrt_poll) [W32]: Use syscall clamp.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/src/estream.c b/src/estream.c
index dcabd92..a1cc62e 100644
--- a/src/estream.c
+++ b/src/estream.c
@@ -4802,7 +4802,9 @@ _gpgrt_poll (gpgrt_poll_t *fds, unsigned int nfds, int timeout)
   /* Now do the real select.  */
 #ifdef HAVE_W32_SYSTEM
 
+  _gpgrt_pre_syscall ();
   count = _gpgrt_w32_poll (fds, nfds, timeout);
+  _gpgrt_post_syscall ();
 
 #else /*!HAVE_W32_SYSTEM*/
 
diff --git a/src/w32-estream.c b/src/w32-estream.c
index 2122c59..c1bf212 100644
--- a/src/w32-estream.c
+++ b/src/w32-estream.c
@@ -771,6 +771,8 @@ func_w32_pollable_write (void *cookie, const void *buffer, size_t count)
 }
 
 
+/* This is the core of _gpgrt_poll.  The caller needs to make sure that
+ * the syscall clamp has been engaged.  */
 int
 _gpgrt_w32_poll (gpgrt_poll_t *fds, size_t nfds, int timeout)
 {

-----------------------------------------------------------------------

Summary of changes:
 src/estream.c     | 2 ++
 src/w32-estream.c | 2 ++
 2 files changed, 4 insertions(+)


hooks/post-receive
-- 
Error codes used by GnuPG et al.
http://git.gnupg.org




More information about the Gnupg-commits mailing list