diff options
| author | NIIBE Yutaka <[email protected]> | 2024-07-09 01:29:44 +0000 |
|---|---|---|
| committer | NIIBE Yutaka <[email protected]> | 2024-07-09 01:41:03 +0000 |
| commit | af6c47b2910f394faf582800d60d88e9b4dcf834 (patch) | |
| tree | c91760d38c1c8bb35a05564f5fd13f98e8a01999 /common/call-gpg.c | |
| parent | Use gpgrt_process_spawn API from libgpg-error. (diff) | |
| download | gnupg-af6c47b2910f394faf582800d60d88e9b4dcf834.tar.gz gnupg-af6c47b2910f394faf582800d60d88e9b4dcf834.zip | |
common,kbx,tests: Clean up the PIPE function API.
* common/call-gpg.c (_gpg_encrypt, _gpg_decrypt): Simply, use
gnupg_create_pipe.
* tests/gpgscm/ffi.c (do_inbound_pipe): Likewise.
* common/exechelp.h (gnupg_create_inbound_pipe): Use gnupg_fd_t
for native pipe descriptor and don't expose other end of pipe.
(gnupg_create_outbound_pipe): Ditto.
* common/exechelp-posix.c (create_pipe_and_estream): Clean up.
(gnupg_create_inbound_pipe): Fail if R_FD or R_FP is NULL.
(gnupg_create_outbound_pipe: Ditto.
* common/exechelp-w32.c (create_pipe_and_estream): Clean up.
(gnupg_create_inbound_pipe): Fail if R_FD or R_FP is NULL.
(gnupg_create_outbound_pipe: Ditto.
(gnupg_create_pipe): Move the code from original
create_pipe_and_estream to call _open_osfhandle.
* common/exectool.c (gnupg_exec_tool_stream): Follow the change of
API.
* kbx/kbx-client-util.c (prepare_data_pipe): Likewise.
--
GnuPG-bug-id: 7194
Signed-off-by: NIIBE Yutaka <[email protected]>
Diffstat (limited to 'common/call-gpg.c')
| -rw-r--r-- | common/call-gpg.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/common/call-gpg.c b/common/call-gpg.c index a4723ca43..8c69a0c9a 100644 --- a/common/call-gpg.c +++ b/common/call-gpg.c @@ -29,6 +29,7 @@ #include <time.h> #include "call-gpg.h" +#include "sysutils.h" #include "exechelp.h" #include "i18n.h" #include "logging.h" @@ -428,9 +429,9 @@ _gpg_encrypt (ctrl_t ctrl, assert ((reader_mb == NULL) != (cipher_stream == NULL)); /* Create two pipes. */ - err = gnupg_create_outbound_pipe (outbound_fds, NULL, 0); + err = gnupg_create_pipe (outbound_fds); if (!err) - err = gnupg_create_inbound_pipe (inbound_fds, NULL, 0); + err = gnupg_create_pipe (inbound_fds); if (err) { log_error (_("error creating a pipe: %s\n"), gpg_strerror (err)); @@ -612,9 +613,9 @@ _gpg_decrypt (ctrl_t ctrl, assert ((reader_mb == NULL) != (plain_stream == NULL)); /* Create two pipes. */ - err = gnupg_create_outbound_pipe (outbound_fds, NULL, 0); + err = gnupg_create_pipe (outbound_fds); if (!err) - err = gnupg_create_inbound_pipe (inbound_fds, NULL, 0); + err = gnupg_create_pipe (inbound_fds); if (err) { log_error (_("error creating a pipe: %s\n"), gpg_strerror (err)); |