2004-09-30 Marcus Brinkmann <marcus@g10code.de>

	* 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.

diff --git a/gpgme/ChangeLog b/gpgme/ChangeLog
index 62bb588a08e872a44b4d7a8f6c5678d3251a120d..099faa9eb4a5b1de9f991876d9b55dfcb984cbfd 100644 (file)
--- a/gpgme/ChangeLog
+++ b/gpgme/ChangeLog
@@ -1,5 +1,9 @@
 2004-09-30  Marcus Brinkmann  <marcus@g10code.de>
 
+       * 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/gpgme/rungpg.c b/gpgme/rungpg.c
index 5d42f9320a8641ed53fccc04a9057c1b12bff9ca..ce938c6237d529f6aabef60bff235869f18484d6 100644 (file)
--- a/gpgme/rungpg.c
+++ b/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.  */