summaryrefslogtreecommitdiffstats
path: root/common/exechelp.h
diff options
context:
space:
mode:
authorNIIBE Yutaka <gniibe@fsij.org>2024-07-09 02:39:15 +0200
committerNIIBE Yutaka <gniibe@fsij.org>2024-07-09 03:04:16 +0200
commit953dd67368ceaeb8b42cfb8f9b5f3c4de8afdbe0 (patch)
tree34861697c585e95c970fd6955ea749867efcb6ec /common/exechelp.h
parentspeedo: Set PREFIX for bzip2 build also for Unix. (diff)
downloadgnupg2-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 'common/exechelp.h')
-rw-r--r--common/exechelp.h95
1 files changed, 0 insertions, 95 deletions
diff --git a/common/exechelp.h b/common/exechelp.h
index 93ba12eeb..be7119357 100644
--- a/common/exechelp.h
+++ b/common/exechelp.h
@@ -72,99 +72,4 @@ gpg_error_t gnupg_create_pipe (int filedes[2]);
/* Close the end of a pipe. */
void gnupg_close_pipe (int fd);
-
-/* The opaque type for a subprocess. */
-typedef struct gnupg_process *gnupg_process_t;
-typedef struct gnupg_spawn_actions *gnupg_spawn_actions_t;
-gpg_err_code_t gnupg_spawn_actions_new (gnupg_spawn_actions_t *r_act);
-void gnupg_spawn_actions_release (gnupg_spawn_actions_t act);
-#ifdef HAVE_W32_SYSTEM
-void gnupg_spawn_actions_set_envvars (gnupg_spawn_actions_t, char *);
-void gnupg_spawn_actions_set_redirect (gnupg_spawn_actions_t,
- void *, void *, void *);
-void gnupg_spawn_actions_set_inherit_handles (gnupg_spawn_actions_t, void **);
-#else
-void gnupg_spawn_actions_set_environ (gnupg_spawn_actions_t, char **);
-void gnupg_spawn_actions_set_redirect (gnupg_spawn_actions_t, int, int, int);
-void gnupg_spawn_actions_set_inherit_fds (gnupg_spawn_actions_t,
- const int *);
-void gnupg_spawn_actions_set_atfork (gnupg_spawn_actions_t,
- void (*atfork)(void *), void *arg);
-#endif
-
-#define GNUPG_PROCESS_DETACHED (1 << 1)
-
-/* Specify how to keep/connect standard fds. */
-#define GNUPG_PROCESS_STDIN_PIPE (1 << 8)
-#define GNUPG_PROCESS_STDOUT_PIPE (1 << 9)
-#define GNUPG_PROCESS_STDERR_PIPE (1 << 10)
-#define GNUPG_PROCESS_STDINOUT_SOCKETPAIR (1 << 11)
-#define GNUPG_PROCESS_STDIN_KEEP (1 << 12)
-#define GNUPG_PROCESS_STDOUT_KEEP (1 << 13)
-#define GNUPG_PROCESS_STDERR_KEEP (1 << 14)
-#define GNUPG_PROCESS_STDFDS_SETTING ( GNUPG_PROCESS_STDIN_PIPE \
- | GNUPG_PROCESS_STDOUT_PIPE | GNUPG_PROCESS_STDERR_PIPE \
- | GNUPG_PROCESS_STDINOUT_SOCKETPAIR | GNUPG_PROCESS_STDIN_KEEP \
- | GNUPG_PROCESS_STDOUT_KEEP | GNUPG_PROCESS_STDERR_KEEP)
-
-#define GNUPG_PROCESS_STREAM_NONBLOCK (1 << 16)
-
-/* Spawn PGMNAME. */
-gpg_err_code_t gnupg_process_spawn (const char *pgmname, const char *argv1[],
- unsigned int flags,
- gnupg_spawn_actions_t act,
- gnupg_process_t *r_process);
-
-/* Get FDs for subprocess I/O. It is the caller which should care
- FDs (closing FDs). */
-gpg_err_code_t gnupg_process_get_fds (gnupg_process_t process,
- unsigned int flags,
- int *r_fd_in, int *r_fd_out,
- int *r_fd_err);
-
-/* Get STREAMs for subprocess I/O. It is the caller which should care
- STREAMs (closing STREAMs). */
-gpg_err_code_t gnupg_process_get_streams (gnupg_process_t process,
- unsigned int flags,
- gpgrt_stream_t *r_fp_in,
- gpgrt_stream_t *r_fp_out,
- gpgrt_stream_t *r_fp_err);
-
-enum gnupg_process_requests
- {
- /* Portable requests */
- GNUPG_PROCESS_NOP = 0,
- GNUPG_PROCESS_GET_PROC_ID = 1,
- GNUPG_PROCESS_GET_EXIT_ID = 2,
-
- /* POSIX only */
- GNUPG_PROCESS_GET_PID = 16,
- GNUPG_PROCESS_GET_WSTATUS = 17,
- GNUPG_PROCESS_KILL = 18,
-
- /* Windows only */
- GNUPG_PROCESS_GET_P_HANDLE = 32,
- GNUPG_PROCESS_GET_HANDLES = 33,
- GNUPG_PROCESS_GET_EXIT_CODE = 34,
- GNUPG_PROCESS_KILL_WITH_EC = 35
- };
-
-/* Control of a process. */
-gpg_err_code_t gnupg_process_ctl (gnupg_process_t process,
- unsigned int request, ...);
-
-/* Wait for a single PROCESS. */
-gpg_err_code_t gnupg_process_wait (gnupg_process_t process, int hang);
-
-/* Terminate a PROCESS. */
-gpg_err_code_t gnupg_process_terminate (gnupg_process_t process);
-
-/* Release PROCESS resources. */
-void gnupg_process_release (gnupg_process_t process);
-
-/* Wait for a multiple processes. */
-gpg_err_code_t gnupg_process_wait_list (gnupg_process_t *process_list,
- int count, int hang);
-
-
#endif /*GNUPG_COMMON_EXECHELP_H*/