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 --- common/t-exechelp.c | 66 +---------------------------------------------------- 1 file changed, 1 insertion(+), 65 deletions(-) (limited to 'common/t-exechelp.c') diff --git a/common/t-exechelp.c b/common/t-exechelp.c index f25c91d3a..b9a2e1e2c 100644 --- a/common/t-exechelp.c +++ b/common/t-exechelp.c @@ -25,6 +25,7 @@ #include #include "util.h" +#include "sysutils.h" #include "exechelp.h" static int verbose; @@ -248,75 +249,11 @@ run_server (void) } -static void -test_pipe_stream (const char *pgmname) -{ - gpg_error_t err; - gnupg_process_t proc; - estream_t outfp; - const char *argv[2]; - unsigned int len; - size_t n; - off_t o; - int ret; - - argv[0] = "--server"; - argv[1] = NULL; - - err = gnupg_process_spawn (pgmname, argv, - (GNUPG_PROCESS_STDOUT_PIPE - |GNUPG_PROCESS_STDERR_KEEP), - NULL, &proc); - if (err) - { - fprintf (stderr, "gnupg_process_spawn failed\n"); - exit (1); - } - - gnupg_process_get_streams (proc, 0, NULL, &outfp, NULL); - - ret = es_read (outfp, (void *)&len, sizeof (len), NULL); - if (ret) - { - fprintf (stderr, "es_read (1) failed\n"); - exit (1); - } - - o = 0; - while (1) - { - if (es_feof (outfp)) - break; - - ret = es_read (outfp, buff4k, sizeof (buff4k), &n); - if (ret) - { - fprintf (stderr, "es_read (2) failed\n"); - exit (1); - } - - memcpy (buff12k + o, buff4k, n); - o += n; - } - - if (o != sizeof (buff12k)) - { - fprintf (stderr, "received data with wrong length %d\n", (int)o); - exit (1); - } - es_fclose (outfp); - gnupg_process_release (proc); -} - - int main (int argc, char **argv) { - const char *myname = "no-pgm"; - if (argc) { - myname = argv[0]; argc--; argv++; } if (argc && !strcmp (argv[0], "--verbose")) @@ -330,7 +267,6 @@ main (int argc, char **argv) #ifndef HAVE_W32_SYSTEM test_close_all_fds (); #endif - test_pipe_stream (myname); return 0; } -- cgit v1.2.3