From af6c47b2910f394faf582800d60d88e9b4dcf834 Mon Sep 17 00:00:00 2001 From: NIIBE Yutaka Date: Tue, 9 Jul 2024 10:29:44 +0900 Subject: 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 --- common/exechelp-posix.c | 45 ++++++++++++++++++++++++++------------------- 1 file changed, 26 insertions(+), 19 deletions(-) (limited to 'common/exechelp-posix.c') diff --git a/common/exechelp-posix.c b/common/exechelp-posix.c index b78439dca..2c7cb2adf 100644 --- a/common/exechelp-posix.c +++ b/common/exechelp-posix.c @@ -283,24 +283,31 @@ do_create_pipe (int filedes[2]) static gpg_error_t -create_pipe_and_estream (int filedes[2], estream_t *r_fp, +create_pipe_and_estream (gnupg_fd_t *r_fd, estream_t *r_fp, int outbound, int nonblock) { gpg_error_t err; + int filedes[2]; if (pipe (filedes) == -1) { err = my_error_from_syserror (); log_error (_("error creating a pipe: %s\n"), gpg_strerror (err)); - filedes[0] = filedes[1] = -1; + *r_fd = -1; *r_fp = NULL; return err; } if (!outbound) - *r_fp = es_fdopen (filedes[0], nonblock? "r,nonblock" : "r"); + { + *r_fd = filedes[1]; + *r_fp = es_fdopen (filedes[0], nonblock? "r,nonblock" : "r"); + } else - *r_fp = es_fdopen (filedes[1], nonblock? "w,nonblock" : "w"); + { + *r_fd = filedes[0]; + *r_fp = es_fdopen (filedes[1], nonblock? "w,nonblock" : "w"); + } if (!*r_fp) { err = my_error_from_syserror (); @@ -308,7 +315,7 @@ create_pipe_and_estream (int filedes[2], estream_t *r_fp, gpg_strerror (err)); close (filedes[0]); close (filedes[1]); - filedes[0] = filedes[1] = -1; + *r_fd = -1; return err; } return 0; @@ -316,28 +323,28 @@ create_pipe_and_estream (int filedes[2], estream_t *r_fp, /* 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 - read end and stored at R_FP. */ + 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 (int filedes[2], estream_t *r_fp, int nonblock) +gnupg_create_inbound_pipe (gnupg_fd_t *r_fd, estream_t *r_fp, int nonblock) { - if (r_fp) - return create_pipe_and_estream (filedes, r_fp, 0, nonblock); - else - return do_create_pipe (filedes); + if (!r_fd || !r_fp) + gpg_error (GPG_ERR_INV_ARG); + + return create_pipe_and_estream (r_fd, r_fp, 0, 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. */ + 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 (int filedes[2], estream_t *r_fp, int nonblock) +gnupg_create_outbound_pipe (gnupg_fd_t *r_fd, estream_t *r_fp, int nonblock) { - if (r_fp) - return create_pipe_and_estream (filedes, r_fp, 1, nonblock); - else - return do_create_pipe (filedes); + if (!r_fd || !r_fp) + gpg_error (GPG_ERR_INV_ARG); + + return create_pipe_and_estream (r_fd, r_fp, 1, nonblock); } -- cgit v1.2.3