2005-06-03  Marcus Brinkmann  <marcus@g10code.de>

	* wait-global.c (gpgme_wait): Break out of the fd processing loop
	after an error.
	Reported by Igor Belyi <gpgme@katehok.ac93.org>.

tests/
2005-06-03  Marcus Brinkmann  <marcus@g10code.de>

	* gpg/Makefile.am (TESTS): Add t-wait.
	* gpg/t-wait.c (main): New test.
This commit is contained in:
Marcus Brinkmann 2005-06-02 23:09:54 +00:00
parent 4d6af25966
commit 63ac903f64
4 changed files with 18 additions and 2 deletions

View File

@ -1,3 +1,9 @@
2005-06-03 Marcus Brinkmann <marcus@g10code.de>
* wait-global.c (gpgme_wait): Break out of the fd processing loop
after an error.
Reported by Igor Belyi <gpgme@katehok.ac93.org>.
2005-06-02 Marcus Brinkmann <marcus@g10code.de> 2005-06-02 Marcus Brinkmann <marcus@g10code.de>
* wait.h (_gpgme_run_io_cb): New prototype. * wait.h (_gpgme_run_io_cb): New prototype.

View File

@ -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_io_close (ictx->fdt.fds[idx].fd);
_gpgme_engine_io_event (ictx->engine, GPGME_EVENT_DONE, _gpgme_engine_io_event (ictx->engine, GPGME_EVENT_DONE,
&err); &err);
/* Break out of the loop, and retry the select()
from scratch, because now all fds should be
gone. */
break;
} }
} }
} }

View File

@ -1,3 +1,8 @@
2005-06-03 Marcus Brinkmann <marcus@g10code.de>
* gpg/Makefile.am (TESTS): Add t-wait.
* gpg/t-wait.c (main): New test.
2004-12-07 Marcus Brinkmann <marcus@g10code.de> 2004-12-07 Marcus Brinkmann <marcus@g10code.de>
* gpg/mkdemodirs: Add copyright notice. * gpg/mkdemodirs: Add copyright notice.

View File

@ -1,5 +1,5 @@
# Copyright (C) 2000 Werner Koch (dd9jn) # 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. # 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 \ TESTS = t-encrypt t-encrypt-sym t-encrypt-sign t-sign t-signers \
t-decrypt t-verify t-decrypt-verify \ t-decrypt t-verify t-decrypt-verify \
t-export t-import t-trustlist t-eventloop t-edit \ 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 CLEANFILES = secring.gpg pubring.gpg trustdb.gpg
DISTCLEANFILES = pubring.gpg~ random_seed DISTCLEANFILES = pubring.gpg~ random_seed