diff options
| -rw-r--r-- | gpgme/ChangeLog | 8 | ||||
| -rw-r--r-- | gpgme/posix-io.c | 2 | ||||
| -rw-r--r-- | gpgme/rungpg.c | 3 | ||||
| -rw-r--r-- | gpgme/w32-io.c | 7 |
4 files changed, 11 insertions, 9 deletions
diff --git a/gpgme/ChangeLog b/gpgme/ChangeLog index 53799be3..a34cf953 100644 --- a/gpgme/ChangeLog +++ b/gpgme/ChangeLog @@ -1,3 +1,11 @@ +2002-11-25 Marcus Brinkmann <[email protected]> + + * 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 <[email protected]> * gpgme.h [_MSC_VER]: Define ssize_t as long. diff --git a/gpgme/posix-io.c b/gpgme/posix-io.c index da7c106d..ecd7a217 100644 --- 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 05d0718e..9a556cee 100644 --- 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 df2583bf..91dfe87b 100644 --- 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" |