diff options
| author | Werner Koch <wk@gnupg.org> | 2016-05-27 22:48:04 +0200 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2016-05-27 22:48:31 +0200 |
| commit | 44a32455c8e41400ea96db4507c8a42bdb65b3b6 (patch) | |
| tree | 25672960c35cdc1b7fd4650313c7300782f73f36 /tools/gpgconf-comp.c | |
| parent | common: Simplify the fd closing patch 512c56a. (diff) | |
| download | gnupg2-44a32455c8e41400ea96db4507c8a42bdb65b3b6.tar.xz gnupg2-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 <wk@gnupg.org>
Diffstat (limited to 'tools/gpgconf-comp.c')
| -rw-r--r-- | tools/gpgconf-comp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/gpgconf-comp.c b/tools/gpgconf-comp.c index 5d4a26a5c..3d456a968 100644 --- a/tools/gpgconf-comp.c +++ b/tools/gpgconf-comp.c @@ -1626,7 +1626,7 @@ gc_component_check_options (int component, estream_t out, const char *conf_file) result = 0; errlines = NULL; - err = gnupg_spawn_process (pgmname, argv, NULL, 0, + err = gnupg_spawn_process (pgmname, argv, NULL, NULL, 0, NULL, NULL, &errfp, &pid); if (err) result |= 1; /* Program could not be run. */ @@ -1965,7 +1965,7 @@ retrieve_options_from_program (gc_component_t component, gc_backend_t backend) argv[0] = "--gpgconf-list"; argv[1] = NULL; - err = gnupg_spawn_process (pgmname, argv, NULL, 0, + err = gnupg_spawn_process (pgmname, argv, NULL, NULL, 0, NULL, &outfp, NULL, &pid); if (err) { |