diff options
| author | NIIBE Yutaka <gniibe@fsij.org> | 2024-07-09 02:39:15 +0200 |
|---|---|---|
| committer | NIIBE Yutaka <gniibe@fsij.org> | 2024-07-09 03:04:16 +0200 |
| commit | 953dd67368ceaeb8b42cfb8f9b5f3c4de8afdbe0 (patch) | |
| tree | 34861697c585e95c970fd6955ea749867efcb6ec /scd | |
| parent | speedo: Set PREFIX for bzip2 build also for Unix. (diff) | |
| download | gnupg2-953dd67368ceaeb8b42cfb8f9b5f3c4de8afdbe0.tar.xz gnupg2-953dd67368ceaeb8b42cfb8f9b5f3c4de8afdbe0.zip | |
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 <gniibe@fsij.org>
Diffstat (limited to 'scd')
| -rw-r--r-- | scd/apdu.c | 1 | ||||
| -rw-r--r-- | scd/app.c | 10 |
2 files changed, 5 insertions, 6 deletions
diff --git a/scd/apdu.c b/scd/apdu.c index 35b845b40..f34f8b7b8 100644 --- a/scd/apdu.c +++ b/scd/apdu.c @@ -43,7 +43,6 @@ #if defined(GNUPG_MAJOR_VERSION) # include "scdaemon.h" -# include "../common/exechelp.h" #endif /*GNUPG_MAJOR_VERSION*/ #include "../common/host2net.h" @@ -2498,7 +2498,7 @@ report_change (int slot, int old_status, int cur_status) gpg_error_t err; const char *args[9]; char numbuf1[30], numbuf2[30], numbuf3[30]; - gnupg_spawn_actions_t act = NULL; + gpgrt_spawn_actions_t act = NULL; sprintf (numbuf1, "%d", slot); sprintf (numbuf2, "0x%04X", old_status); @@ -2516,15 +2516,15 @@ report_change (int slot, int old_status, int cur_status) args[8] = NULL; fname = make_filename (gnupg_homedir (), "scd-event", NULL); - err = gnupg_spawn_actions_new (&act); + err = gpgrt_spawn_actions_new (&act); if (!err) { #ifndef HAVE_W32_SYSTEM - gnupg_spawn_actions_set_atfork (act, setup_env, envstr); + gpgrt_spawn_actions_set_atfork (act, setup_env, envstr); #endif - err = gnupg_process_spawn (fname, args, GNUPG_PROCESS_DETACHED, + err = gpgrt_process_spawn (fname, args, GPGRT_PROCESS_DETACHED, act, NULL); - gnupg_spawn_actions_release (act); + gpgrt_spawn_actions_release (act); } if (err && gpg_err_code (err) != GPG_ERR_ENOENT) log_error ("failed to run event handler '%s': %s\n", |