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/exechelp.h | |
| 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/exechelp.h')
| -rw-r--r-- | common/exechelp.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/common/exechelp.h b/common/exechelp.h index be7119357..d2aac4b39 100644 --- a/common/exechelp.h +++ b/common/exechelp.h @@ -54,15 +54,15 @@ int *get_all_open_fds (void); /* Portable function to create a pipe. Under Windows the write end is - inheritable. If R_FP is not NULL, an estream is created for the - write end and stored at R_FP. */ -gpg_error_t gnupg_create_inbound_pipe (int filedes[2], + inheritable. Pipe is created and the read end is stored at R_FD. + An estream is created for the write end and stored at R_FP. */ +gpg_error_t gnupg_create_inbound_pipe (gnupg_fd_t *r_fd, estream_t *r_fp, int nonblock); /* Portable function to create a pipe. Under Windows the read end is - inheritable. If R_FP is not NULL, an estream is created for the - write end and stored at R_FP. */ -gpg_error_t gnupg_create_outbound_pipe (int filedes[2], + inheritable. Pipe is created and the write end is stored at R_FD. + An estream is created for the write end and stored at R_FP. */ +gpg_error_t gnupg_create_outbound_pipe (gnupg_fd_t *r_fd, estream_t *r_fp, int nonblock); /* Portable function to create a pipe. Under Windows both ends are |