mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-02 22:46:30 +02:00
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 <gniibe@fsij.org>
This commit is contained in:
parent
953dd67368
commit
af6c47b291
7 changed files with 144 additions and 114 deletions
|
@ -1241,7 +1241,7 @@ do_inbound_pipe (scheme *sc, pointer args)
|
|||
FFI_PROLOG ();
|
||||
int filedes[2];
|
||||
FFI_ARGS_DONE_OR_RETURN (sc, args);
|
||||
err = gnupg_create_inbound_pipe (filedes, NULL, 0);
|
||||
err = gnupg_create_pipe (filedes);
|
||||
#define IMC(A, B) \
|
||||
_cons (sc, sc->vptr->mk_integer (sc, (unsigned long) (A)), (B), 1)
|
||||
FFI_RETURN_POINTER (sc, IMC (filedes[0],
|
||||
|
@ -1255,7 +1255,7 @@ do_outbound_pipe (scheme *sc, pointer args)
|
|||
FFI_PROLOG ();
|
||||
int filedes[2];
|
||||
FFI_ARGS_DONE_OR_RETURN (sc, args);
|
||||
err = gnupg_create_outbound_pipe (filedes, NULL, 0);
|
||||
err = gnupg_create_pipe (filedes);
|
||||
#define IMC(A, B) \
|
||||
_cons (sc, sc->vptr->mk_integer (sc, (unsigned long) (A)), (B), 1)
|
||||
FFI_RETURN_POINTER (sc, IMC (filedes[0],
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue