diff options
| author | Marcus Brinkmann <[email protected]> | 2005-06-02 23:09:54 +0000 |
|---|---|---|
| committer | Marcus Brinkmann <[email protected]> | 2005-06-02 23:09:54 +0000 |
| commit | 63ac903f64aec6fb71499f4c524aacaaac25388e (patch) | |
| tree | ed1b75f943ab31e89e65ac47e12df1db84ee5755 | |
| parent | This commit was manufactured by cvs2svn to create branch (diff) | |
| download | gpgme-63ac903f64aec6fb71499f4c524aacaaac25388e.tar.gz gpgme-63ac903f64aec6fb71499f4c524aacaaac25388e.zip | |
gpgme/
2005-06-03 Marcus Brinkmann <[email protected]>
* wait-global.c (gpgme_wait): Break out of the fd processing loop
after an error.
Reported by Igor Belyi <[email protected]>.
tests/
2005-06-03 Marcus Brinkmann <[email protected]>
* gpg/Makefile.am (TESTS): Add t-wait.
* gpg/t-wait.c (main): New test.
| -rw-r--r-- | gpgme/ChangeLog | 6 | ||||
| -rw-r--r-- | gpgme/wait-global.c | 5 | ||||
| -rw-r--r-- | tests/ChangeLog | 5 | ||||
| -rw-r--r-- | tests/gpg/Makefile.am | 4 |
4 files changed, 18 insertions, 2 deletions
diff --git a/gpgme/ChangeLog b/gpgme/ChangeLog index d949da74..ccb53ffb 100644 --- a/gpgme/ChangeLog +++ b/gpgme/ChangeLog @@ -1,3 +1,9 @@ +2005-06-03 Marcus Brinkmann <[email protected]> + + * wait-global.c (gpgme_wait): Break out of the fd processing loop + after an error. + Reported by Igor Belyi <[email protected]>. + 2005-06-02 Marcus Brinkmann <[email protected]> * wait.h (_gpgme_run_io_cb): New prototype. diff --git a/gpgme/wait-global.c b/gpgme/wait-global.c index 7895d8b4..30b6cb04 100644 --- a/gpgme/wait-global.c +++ b/gpgme/wait-global.c @@ -322,6 +322,11 @@ gpgme_wait (gpgme_ctx_t ctx, gpgme_error_t *status, int hang) _gpgme_io_close (ictx->fdt.fds[idx].fd); _gpgme_engine_io_event (ictx->engine, GPGME_EVENT_DONE, &err); + + /* Break out of the loop, and retry the select() + from scratch, because now all fds should be + gone. */ + break; } } } diff --git a/tests/ChangeLog b/tests/ChangeLog index d7bc2424..690e4585 100644 --- a/tests/ChangeLog +++ b/tests/ChangeLog @@ -1,3 +1,8 @@ +2005-06-03 Marcus Brinkmann <[email protected]> + + * gpg/Makefile.am (TESTS): Add t-wait. + * gpg/t-wait.c (main): New test. + 2004-12-07 Marcus Brinkmann <[email protected]> * gpg/mkdemodirs: Add copyright notice. diff --git a/tests/gpg/Makefile.am b/tests/gpg/Makefile.am index ceda8698..73009a98 100644 --- a/tests/gpg/Makefile.am +++ b/tests/gpg/Makefile.am @@ -1,5 +1,5 @@ # Copyright (C) 2000 Werner Koch (dd9jn) -# Copyright (C) 2001, 2004 g10 Code GmbH +# Copyright (C) 2001, 2004, 2005 g10 Code GmbH # # This file is part of GPGME. # @@ -28,7 +28,7 @@ noinst_HEADERS = t-support.h TESTS = t-encrypt t-encrypt-sym t-encrypt-sign t-sign t-signers \ t-decrypt t-verify t-decrypt-verify \ t-export t-import t-trustlist t-eventloop t-edit \ - t-keylist t-keylist-sig t-thread1 + t-keylist t-keylist-sig t-thread1 t-wait CLEANFILES = secring.gpg pubring.gpg trustdb.gpg DISTCLEANFILES = pubring.gpg~ random_seed |