2002-11-25 Marcus Brinkmann <marcus@g10code.de>

	* rungpg.c (_gpgme_gpg_spawn): Do not set parent fds to -1.
	* posix-io.c (_gpgme_io_spawn): Call _gpgme_io_close instead close
	for parent fds.
	* w32-io.c (_gpgme_io_spawn): Call _gpgme_io_close instead
	CloseHandle for parent fds.

diff --git a/gpgme/ChangeLog b/gpgme/ChangeLog
index 53799be33c9b0f999e1e937b9b3c575303f61055..a34cf953df257d5a980b7aa60ac7c09ea8b117b4 100644 (file)
--- a/gpgme/ChangeLog
+++ b/gpgme/ChangeLog
@@ -1,3 +1,11 @@
+2002-11-25  Marcus Brinkmann  <marcus@g10code.de>
+
+       * rungpg.c (_gpgme_gpg_spawn): Do not set parent fds to -1.
+       * posix-io.c (_gpgme_io_spawn): Call _gpgme_io_close instead close
+       for parent fds.
+       * w32-io.c (_gpgme_io_spawn): Call _gpgme_io_close instead
+       CloseHandle for parent fds.
+
 2002-11-22  Marcus Brinkmann  <marcus@g10code.de>
 
        * gpgme.h [_MSC_VER]: Define ssize_t as long.

diff --git a/gpgme/posix-io.c b/gpgme/posix-io.c
index da7c106d80437c4d07244626b96ba0c086295591..ecd7a21778bd2c237e78ddc6d4573f20d302550c 100644 (file)
--- a/gpgme/posix-io.c
+++ b/gpgme/posix-io.c
@@ -257,7 +257,7 @@ _gpgme_io_spawn (const char *path, char **argv,
 
   /* .dup_to is not used in the parent list.  */
   for (i = 0; fd_parent_list[i].fd != -1; i++)
-    close (fd_parent_list[i].fd);
+    _gpgme_io_close (fd_parent_list[i].fd);
 
   return 0;
 }

diff --git a/gpgme/rungpg.c b/gpgme/rungpg.c
index 05d0718e1a22bfd4577e2180bacf882e1e4d8a8e..9a556cee2d4cf622faa7f9eb5ae3cf3210916e97 100644 (file)
--- a/gpgme/rungpg.c
+++ b/gpgme/rungpg.c
@@ -1137,21 +1137,18 @@ gpg_start (void *engine, void *opaque)
       fd_parent_list[n].fd = gpg->status.fd[1];
       fd_parent_list[n].dup_to = -1;
       n++;
-      gpg->status.fd[1] = -1;
     }
   if (gpg->colon.fd[1] != -1)
     {
       fd_parent_list[n].fd = gpg->colon.fd[1];
       fd_parent_list[n].dup_to = -1;
       n++;
-      gpg->colon.fd[1] = -1;
     }
   for (i = 0; gpg->fd_data_map[i].data; i++)
     {
       fd_parent_list[n].fd = gpg->fd_data_map[i].peer_fd;
       fd_parent_list[n].dup_to = -1;
       n++;
-      gpg->fd_data_map[i].peer_fd = -1;
     }        
   fd_parent_list[n].fd = -1;
   fd_parent_list[n].dup_to = -1;

diff --git a/gpgme/w32-io.c b/gpgme/w32-io.c
index df2583bf340d29d7c3851d68fae6540f1b8512fd..91dfe87b741cbf5c40d9ac656194fb03ac18b081 100644 (file)
--- a/gpgme/w32-io.c
+++ b/gpgme/w32-io.c
@@ -899,11 +899,8 @@ _gpgme_io_spawn ( const char *path, char **argv,
     }
 
     /* Close the other ends of the pipes */
-    for (i=0; fd_parent_list[i].fd != -1; i++ ) {
-        DEBUG1 ("Closing fd %d\n", fd_parent_list[i].fd );
-        if ( !CloseHandle ( fd_to_handle (fd_parent_list[i].fd) ) )
-            DEBUG1 ("CloseHandle failed: ec=%d", (int)GetLastError());
-    }
+    for (i = 0; fd_parent_list[i].fd != -1; i++)
+      _gpgme_io_close (fd_parent_list[i].fd);
 
     DEBUG4 ("CreateProcess ready\n"
             "-   hProcess=%p  hThread=%p\n"