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 <[email protected]>

1 files changed, 6 insertions, 7 deletions

diff --git a/g10/photoid.c b/g10/photoid.c
index b226cbedd..5b8900f32 100644
--- a/g10/photoid.c
+++ b/g10/photoid.c
@@ -424,7 +424,6 @@ show_photo (const char *command, const char *name, const void *image, u32 len)
 }
 #else /* ! NO_EXEC */
 #include "../common/membuf.h"
-#include "../common/exechelp.h"
 
 /* Makes a temp directory and filenames */
 static int
@@ -597,10 +596,10 @@ run_with_pipe (struct spawn_info *info, const void *image, u32 len)
 #else /* !EXEC_TEMPFILE_ONLY */
   gpg_error_t err;
   const char *argv[4];
-  gnupg_process_t proc;
+  gpgrt_process_t proc;
 
   fill_command_argv (argv, info->command);
-  err = gnupg_process_spawn (argv[0], argv+1, GNUPG_PROCESS_STDIN_PIPE,
+  err = gpgrt_process_spawn (argv[0], argv+1, GPGRT_PROCESS_STDIN_PIPE,
                              NULL, &proc);
   if (err)
     log_error (_("unable to execute shell '%s': %s\n"),
@@ -609,7 +608,7 @@ run_with_pipe (struct spawn_info *info, const void *image, u32 len)
     {
       int fd_in;
 
-      err = gnupg_process_get_fds (proc, 0, &fd_in, NULL, NULL);
+      err = gpgrt_process_get_fds (proc, 0, &fd_in, NULL, NULL);
       if (err)
         log_error ("unable to get pipe connection '%s': %s\n",
                    argv[2], gpg_strerror (err));
@@ -619,11 +618,11 @@ run_with_pipe (struct spawn_info *info, const void *image, u32 len)
           close (fd_in);
         }
 
-      err = gnupg_process_wait (proc, 1);
+      err = gpgrt_process_wait (proc, 1);
       if (err)
         log_error (_("unnatural exit of external program\n"));
 
-      gnupg_process_release (proc);
+      gpgrt_process_release (proc);
     }
 #endif /* !EXEC_TEMPFILE_ONLY */
 }
@@ -695,7 +694,7 @@ show_photo (const char *command, const char *name, const void *image, u32 len)
       const char *argv[4];
 
       fill_command_argv (argv, spawn->command);
-      err = gnupg_process_spawn (argv[0], argv+1, 0, NULL, NULL);
+      err = gpgrt_process_spawn (argv[0], argv+1, 0, NULL, NULL);
       if (err)
         log_error (_("unnatural exit of external program\n"));
 #endif