diff options
| author | Werner Koch <[email protected]> | 2016-05-27 22:07:09 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2016-05-27 22:07:09 +0000 |
| commit | 239a4d53916b47b5b0f0167a9b2c7a8915bb9c52 (patch) | |
| tree | 81a7954bc955131f65cd87b26933b42833cdfee5 /tools | |
| parent | common: Allow a second input stream for gnupg_exec_tool_stream. (diff) | |
| download | gnupg-239a4d53916b47b5b0f0167a9b2c7a8915bb9c52.tar.gz gnupg-239a4d53916b47b5b0f0167a9b2c7a8915bb9c52.zip | |
common: Add a status callback to gnupg_exec_tool_stream.
* common/exectool.h (exec_tool_status_cb_t): New.
* common/exectool.c: Include missing exectool.h.
(read_and_log_buffer_t): Replace array by pointer.
(gnupg_exec_tool_stream): Add args 'status_cb' and 'status_cb_value'.
Change all callers to pass NULL for them. Malloc buffer for
FDERRSTATE.
(read_and_log_stderr): Implement status_fd feature.
Signed-off-by: Werner Koch <[email protected]>
Diffstat (limited to '')
| -rw-r--r-- | tools/gpgtar-create.c | 2 | ||||
| -rw-r--r-- | tools/gpgtar-extract.c | 2 | ||||
| -rw-r--r-- | tools/gpgtar-list.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/tools/gpgtar-create.c b/tools/gpgtar-create.c index d615fd38d..6adc1f513 100644 --- a/tools/gpgtar-create.c +++ b/tools/gpgtar-create.c @@ -932,7 +932,7 @@ gpgtar_create (char **inpattern, int encrypt, int sign) } err = gnupg_exec_tool_stream (opt.gpg_program, argv, - outstream, NULL, cipher_stream); + outstream, NULL, cipher_stream, NULL, NULL); xfree (argv); if (err) goto leave; diff --git a/tools/gpgtar-extract.c b/tools/gpgtar-extract.c index c4bf44064..866215b2c 100644 --- a/tools/gpgtar-extract.c +++ b/tools/gpgtar-extract.c @@ -327,7 +327,7 @@ gpgtar_extract (const char *filename, int decrypt) } err = gnupg_exec_tool_stream (opt.gpg_program, argv, - cipher_stream, NULL, stream); + cipher_stream, NULL, stream, NULL, NULL); xfree (argv); if (err) goto leave; diff --git a/tools/gpgtar-list.c b/tools/gpgtar-list.c index a3f85aceb..1d59d9c65 100644 --- a/tools/gpgtar-list.c +++ b/tools/gpgtar-list.c @@ -327,7 +327,7 @@ gpgtar_list (const char *filename, int decrypt) } err = gnupg_exec_tool_stream (opt.gpg_program, argv, - cipher_stream, NULL, stream); + cipher_stream, NULL, stream, NULL, NULL); xfree (argv); if (err) goto leave; |