diff options
| author | Werner Koch <[email protected]> | 2016-05-27 20:48:04 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2016-05-27 20:48:31 +0000 |
| commit | 44a32455c8e41400ea96db4507c8a42bdb65b3b6 (patch) | |
| tree | 25672960c35cdc1b7fd4650313c7300782f73f36 /common/exechelp-w32.c | |
| parent | common: Simplify the fd closing patch 512c56a. (diff) | |
| download | gnupg-44a32455c8e41400ea96db4507c8a42bdb65b3b6.tar.gz gnupg-44a32455c8e41400ea96db4507c8a42bdb65b3b6.zip | |
common: Allow a second input stream for gnupg_exec_tool_stream.
* common/exechelp-posix.c (do_exec): Add arg 'except' and pass to
close_all_fds.
(gnupg_spawn_process): Add arg 'except'. Change callers to pass NULL
for it.
* common/exechelp-w32.c (gnupg_spawn_process): Add dummy arg 'except'.
* common/exechelp-w32ce.c (gnupg_spawn_process): Ditto.
* common/exectool.c (copy_buffer_do_copy): Allow NULL for SINK.
(gnupg_exec_tool_stream): Add arg 'inextra'. Change callers to pass
NULL for it. Allow NULL for OUTPUT.
--
This hack is a first step to allow calling gpg for verification of
signatures.
Signed-off-by: Werner Koch <[email protected]>
Diffstat (limited to 'common/exechelp-w32.c')
| -rw-r--r-- | common/exechelp-w32.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/common/exechelp-w32.c b/common/exechelp-w32.c index a8a8b45c5..b2d2457f6 100644 --- a/common/exechelp-w32.c +++ b/common/exechelp-w32.c @@ -357,7 +357,7 @@ gnupg_create_pipe (int filedes[2]) /* Fork and exec the PGMNAME, see exechelp.h for details. */ gpg_error_t gnupg_spawn_process (const char *pgmname, const char *argv[], - void (*preexec)(void), unsigned int flags, + int *except, void (*preexec)(void), unsigned int flags, estream_t *r_infp, estream_t *r_outfp, estream_t *r_errfp, @@ -388,6 +388,8 @@ gnupg_spawn_process (const char *pgmname, const char *argv[], es_syshd_t syshd; gpg_err_source_t errsource = default_errsource; + (void)except; /* Not yet used. */ + if (r_infp) *r_infp = NULL; if (r_outfp) |