From 953dd67368ceaeb8b42cfb8f9b5f3c4de8afdbe0 Mon Sep 17 00:00:00 2001 From: NIIBE Yutaka Date: Tue, 9 Jul 2024 09:39:15 +0900 Subject: Use gpgrt_process_spawn API from libgpg-error. * agent/genkey.c (do_check_passphrase_pattern): Use the gpgrt API. * common/asshelp.c (start_new_service): Ditto. * common/exechelp.h: Remove gnupg_process_spawn API. * common/exechelp-posix.c: Remove gnupg_process_spawn implementation. * common/exechelp-w32.c: Likewise. * common/exectool.c (gnupg_exec_tool_stream): Use the gpgrt API. * common/t-exechelp.c (test_pipe_stream): Remove. * dirmngr/ldap-wrapper.c (destroy_wrapper, ldap_reaper_thread): Use the gpgrt API. (ldap_wrapper_connection_cleanup, ldap_wrapper): Ditto. * dirmngr/ldap.c, g10/call-keyboxd.c: No need to include exechelp.h. * g10/photoid.c (run_with_pipe, show_photo): Use the gpgrt API. * g13/be-encfs.c (run_umount_helper, run_encfs_tool): Ditto. * g13/g13.c, g13/mount.c, g13/runner.c: No need to include exechelp.h. * scd/apdu.c: No need to include exechelp.h. * scd/app.c (report_change): Use the gpgrt API. * sm/export.c, sm/import.c: No need to include exechelp.h. * tests/gpgscm/ffi.c (proc_object_finalize, proc_wrap) (do_process_spawn_io, do_process_spawn_fd, do_process_wait): Use the gpgrt API. * tools/gpg-auth.c: No need to include exechelp.h. * tools/gpg-card.c (cmd_gpg): Use the gpgrt API. * tools/gpg-connect-agent.c: No need to include exechelp.h. * tools/gpg-mail-tube.c (mail_tube_encrypt, prepare_for_appimage) (start_gpg_encrypt): Use the gpgrt API. * tools/gpgconf-comp.c (gpg_agent_runtime_change) (scdaemon_runtime_change, tpm2daemon_runtime_change) (dirmngr_runtime_change, keyboxd_runtime_change) (gc_component_launch, gc_component_check_options) (retrieve_options_from_program): Ditto. * tools/gpgconf.c (show_versions_via_dirmngr): Ditto. * tools/gpgtar-create.c (gpgtar_create): Ditto. * tools/gpgtar-extract.c (gpgtar_extract): Ditto. * tools/gpgtar-list.c (gpgtar_list): Ditto. -- GnuPG-bug-id: 7192 Signed-off-by: NIIBE Yutaka --- dirmngr/ldap-wrapper.c | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) (limited to 'dirmngr/ldap-wrapper.c') diff --git a/dirmngr/ldap-wrapper.c b/dirmngr/ldap-wrapper.c index a6d58d3b2..c9b7eada1 100644 --- a/dirmngr/ldap-wrapper.c +++ b/dirmngr/ldap-wrapper.c @@ -60,7 +60,6 @@ #include #include "dirmngr.h" -#include "../common/exechelp.h" #include "misc.h" #include "ldap-wrapper.h" @@ -87,7 +86,7 @@ struct wrapper_context_s { struct wrapper_context_s *next; - gnupg_process_t proc;/* The wrapper process. */ + gpgrt_process_t proc;/* The wrapper process. */ int printable_pid; /* Helper to print diagnostics after the process has * been cleaned up. */ estream_t fp; /* Connected with stdout of the ldap wrapper. */ @@ -172,8 +171,8 @@ destroy_wrapper (struct wrapper_context_s *ctx) { if (ctx->proc) { - gnupg_process_terminate (ctx->proc); - gnupg_process_release (ctx->proc); + gpgrt_process_terminate (ctx->proc); + gpgrt_process_release (ctx->proc); } ksba_reader_release (ctx->reader); SAFE_CLOSE (ctx->fp); @@ -440,17 +439,17 @@ ldap_reaper_thread (void *dummy) /* Check whether the process is still running. */ if (ctx->proc) { - err = gnupg_process_wait (ctx->proc, 0); + err = gpgrt_process_wait (ctx->proc, 0); if (!err) { int status; - gnupg_process_ctl (ctx->proc, GNUPG_PROCESS_GET_EXIT_ID, + gpgrt_process_ctl (ctx->proc, GPGRT_PROCESS_GET_EXIT_ID, &status); if (DBG_EXTPROG) log_info (_("ldap wrapper %d ready"), ctx->printable_pid); ctx->ready = 1; - gnupg_process_release (ctx->proc); + gpgrt_process_release (ctx->proc); ctx->proc = NULL; any_action = 1; @@ -472,7 +471,7 @@ ldap_reaper_thread (void *dummy) /* Check whether we should terminate the process. */ if (ctx->proc && ctx->stamp != (time_t)(-1) && ctx->stamp < exptime) { - gnupg_process_terminate (ctx->proc); + gpgrt_process_terminate (ctx->proc); ctx->stamp = (time_t)(-1); log_info (_("ldap wrapper %d stalled - killing\n"), ctx->printable_pid); @@ -634,7 +633,7 @@ ldap_wrapper_connection_cleanup (ctrl_t ctrl) ctx->ctrl->refcount--; ctx->ctrl = NULL; if (ctx->proc) - gnupg_process_terminate (ctx->proc); + gpgrt_process_terminate (ctx->proc); if (ctx->fp_err) log_info ("%s: reading from ldap wrapper %d failed: %s\n", __func__, ctx->printable_pid, gpg_strerror (ctx->fp_err)); @@ -792,7 +791,7 @@ gpg_error_t ldap_wrapper (ctrl_t ctrl, ksba_reader_t *reader, const char *argv[]) { gpg_error_t err; - gnupg_process_t process; + gpgrt_process_t process; struct wrapper_context_s *ctx; int i; int j; @@ -848,9 +847,9 @@ ldap_wrapper (ctrl_t ctrl, ksba_reader_t *reader, const char *argv[]) return err; } - err = gnupg_process_spawn (pgmname, arg_list, - (GNUPG_PROCESS_STDOUT_PIPE - | GNUPG_PROCESS_STDERR_PIPE), + err = gpgrt_process_spawn (pgmname, arg_list, + (GPGRT_PROCESS_STDOUT_PIPE + | GPGRT_PROCESS_STDERR_PIPE), NULL, &process); if (err) { @@ -859,9 +858,9 @@ ldap_wrapper (ctrl_t ctrl, ksba_reader_t *reader, const char *argv[]) log_error ("error running '%s': %s\n", pgmname, gpg_strerror (err)); return err; } - gnupg_process_get_streams (process, GNUPG_PROCESS_STREAM_NONBLOCK, + gpgrt_process_get_streams (process, GPGRT_PROCESS_STREAM_NONBLOCK, NULL, &outfp, &errfp); - gnupg_process_ctl (process, GNUPG_PROCESS_GET_PROC_ID, &ctx->printable_pid); + gpgrt_process_ctl (process, GPGRT_PROCESS_GET_PROC_ID, &ctx->printable_pid); ctx->proc = process; ctx->fp = outfp; -- cgit v1.2.3