mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-02 22:46:30 +02:00
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>
This commit is contained in:
parent
e6d9a2d07e
commit
44a32455c8
10 changed files with 124 additions and 36 deletions
|
@ -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)
|
||||
{
|
||||
|
|
|
@ -932,7 +932,7 @@ gpgtar_create (char **inpattern, int encrypt, int sign)
|
|||
}
|
||||
|
||||
err = gnupg_exec_tool_stream (opt.gpg_program, argv,
|
||||
outstream, cipher_stream);
|
||||
outstream, NULL, cipher_stream);
|
||||
xfree (argv);
|
||||
if (err)
|
||||
goto leave;
|
||||
|
|
|
@ -327,7 +327,7 @@ gpgtar_extract (const char *filename, int decrypt)
|
|||
}
|
||||
|
||||
err = gnupg_exec_tool_stream (opt.gpg_program, argv,
|
||||
cipher_stream, stream);
|
||||
cipher_stream, NULL, stream);
|
||||
xfree (argv);
|
||||
if (err)
|
||||
goto leave;
|
||||
|
|
|
@ -327,7 +327,7 @@ gpgtar_list (const char *filename, int decrypt)
|
|||
}
|
||||
|
||||
err = gnupg_exec_tool_stream (opt.gpg_program, argv,
|
||||
cipher_stream, stream);
|
||||
cipher_stream, NULL, stream);
|
||||
xfree (argv);
|
||||
if (err)
|
||||
goto leave;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue