From f23da05769ebe391612ed78c55b902317914458d Mon Sep 17 00:00:00 2001 From: Marcus Brinkmann Date: Thu, 30 Sep 2004 00:24:58 +0000 Subject: [PATCH] 2004-09-30 Marcus Brinkmann * rungpg.c (read_status): Move the polling of the output data pipe to just before removing the command fd, from just before adding it. This avoids buffering problems. --- trunk/gpgme/ChangeLog | 4 ++++ trunk/gpgme/rungpg.c | 48 ++++++++++++++++++++++--------------------- 2 files changed, 29 insertions(+), 23 deletions(-) diff --git a/trunk/gpgme/ChangeLog b/trunk/gpgme/ChangeLog index 62bb588..099faa9 100644 --- a/trunk/gpgme/ChangeLog +++ b/trunk/gpgme/ChangeLog @@ -1,5 +1,9 @@ 2004-09-30 Marcus Brinkmann + * rungpg.c (read_status): Move the polling of the output data pipe + to just before removing the command fd, from just before adding + it. This avoids buffering problems. + * data.c (_gpgme_data_inbound_handler): Use _gpgme_io_read, not read, to improve debug output. diff --git a/trunk/gpgme/rungpg.c b/trunk/gpgme/rungpg.c index 5d42f93..ce938c6 100644 --- a/trunk/gpgme/rungpg.c +++ b/trunk/gpgme/rungpg.c @@ -841,29 +841,6 @@ read_status (engine_gpg_t gpg) if (nread > 1) DEBUG0 ("ERROR, unexpected data in read_status"); - /* Before we can actually add the command - fd, we might have to flush the linked - output data pipe. */ - if (gpg->cmd.linked_idx != -1 - && gpg->fd_data_map[gpg->cmd.linked_idx].fd != -1) - { - struct io_select_fd_s fds; - fds.fd = gpg->fd_data_map[gpg->cmd.linked_idx].fd; - fds.for_read = 1; - fds.for_write = 0; - fds.frozen = 0; - fds.opaque = NULL; - do - { - fds.signaled = 0; - _gpgme_io_select (&fds, 1, 1); - if (fds.signaled) - _gpgme_data_inbound_handler - (gpg->cmd.linked_data, fds.fd); - } - while (fds.signaled); - } - add_io_cb (gpg, gpg->cmd.fd, 0, command_handler, gpg, &gpg->fd_data_map[gpg->cmd.idx].tag); @@ -883,6 +860,31 @@ read_status (engine_gpg_t gpg) { if (gpg->cmd.used) { + /* Before we can actually add the + command fd, we might have to flush + the linked output data pipe. */ + if (gpg->cmd.linked_idx != -1 + && gpg->fd_data_map[gpg->cmd.linked_idx].fd + != -1) + { + struct io_select_fd_s fds; + fds.fd = + gpg->fd_data_map[gpg->cmd.linked_idx].fd; + fds.for_read = 1; + fds.for_write = 0; + fds.frozen = 0; + fds.opaque = NULL; + do + { + fds.signaled = 0; + _gpgme_io_select (&fds, 1, 1); + if (fds.signaled) + _gpgme_data_inbound_handler + (gpg->cmd.linked_data, fds.fd); + } + while (fds.signaled); + } + /* XXX We must check if there are any more fds active after removing this one. */ -- 2.26.2