aboutsummaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
Diffstat (limited to 'tools')
-rw-r--r--tools/gpg-auth.c1
-rw-r--r--tools/gpg-card.c13
-rw-r--r--tools/gpg-connect-agent.c3
-rw-r--r--tools/gpg-mail-tube.c47
-rw-r--r--tools/gpgconf-comp.c83
-rw-r--r--tools/gpgconf.c13
-rw-r--r--tools/gpgtar-create.c29
-rw-r--r--tools/gpgtar-extract.c27
-rw-r--r--tools/gpgtar-list.c27
9 files changed, 116 insertions, 127 deletions
diff --git a/tools/gpg-auth.c b/tools/gpg-auth.c
index c47bb4e54..874861b25 100644
--- a/tools/gpg-auth.c
+++ b/tools/gpg-auth.c
@@ -33,7 +33,6 @@
#include "../common/asshelp.h"
#include "../common/session-env.h"
#include "../common/membuf.h"
-#include "../common/exechelp.h"
/* We keep all global options in the structure OPT. */
diff --git a/tools/gpg-card.c b/tools/gpg-card.c
index f117330f8..901d4e2a7 100644
--- a/tools/gpg-card.c
+++ b/tools/gpg-card.c
@@ -39,7 +39,6 @@
#include "../common/userids.h"
#include "../common/ccparray.h"
#include "../common/exectool.h"
-#include "../common/exechelp.h"
#include "../common/ttyio.h"
#include "../common/server-help.h"
#include "../common/openpgpdefs.h"
@@ -3803,7 +3802,7 @@ cmd_gpg (card_info_t info, char *argstr, int use_gpgsm)
char **argarray;
ccparray_t ccp;
const char **argv = NULL;
- gnupg_process_t proc;
+ gpgrt_process_t proc;
int i;
if (!info)
@@ -3831,15 +3830,15 @@ cmd_gpg (card_info_t info, char *argstr, int use_gpgsm)
goto leave;
}
- err = gnupg_process_spawn (use_gpgsm? opt.gpgsm_program:opt.gpg_program,
+ err = gpgrt_process_spawn (use_gpgsm? opt.gpgsm_program:opt.gpg_program,
argv,
- (GNUPG_PROCESS_STDOUT_KEEP
- | GNUPG_PROCESS_STDERR_KEEP),
+ (GPGRT_PROCESS_STDOUT_KEEP
+ | GPGRT_PROCESS_STDERR_KEEP),
NULL, &proc);
if (!err)
{
- err = gnupg_process_wait (proc, 1);
- gnupg_process_release (proc);
+ err = gpgrt_process_wait (proc, 1);
+ gpgrt_process_release (proc);
}
diff --git a/tools/gpg-connect-agent.c b/tools/gpg-connect-agent.c
index 577b12575..f16c5201b 100644
--- a/tools/gpg-connect-agent.c
+++ b/tools/gpg-connect-agent.c
@@ -36,9 +36,6 @@
#include "../common/sysutils.h"
#include "../common/membuf.h"
#include "../common/ttyio.h"
-#ifdef HAVE_W32_SYSTEM
-# include "../common/exechelp.h"
-#endif
#include "../common/init.h"
#include "../common/comopt.h"
diff --git a/tools/gpg-mail-tube.c b/tools/gpg-mail-tube.c
index d039bf120..e7ca57c1c 100644
--- a/tools/gpg-mail-tube.c
+++ b/tools/gpg-mail-tube.c
@@ -35,7 +35,6 @@
#include "../common/init.h"
#include "../common/sysutils.h"
#include "../common/ccparray.h"
-#include "../common/exechelp.h"
#include "../common/mbox-util.h"
#include "../common/zb32.h"
#include "rfc822parse.h"
@@ -151,7 +150,7 @@ struct parser_context_s
static gpg_error_t mail_tube_encrypt (estream_t fpin, strlist_t recipients);
static void prepare_for_appimage (void);
static gpg_error_t start_gpg_encrypt (estream_t *r_input,
- gnupg_process_t *r_proc,
+ gpgrt_process_t *r_proc,
strlist_t recipients);
@@ -405,7 +404,7 @@ mail_tube_encrypt (estream_t fpin, strlist_t recipients)
const char *s;
char *boundary = NULL; /* Actually only the random part of it. */
estream_t gpginfp = NULL;
- gnupg_process_t proc = NULL;
+ gpgrt_process_t proc = NULL;
int exitcode;
int i, found;
@@ -562,14 +561,14 @@ mail_tube_encrypt (estream_t fpin, strlist_t recipients)
if (err)
log_error ("error closing pipe: %s\n", gpg_strerror (err));
- err = gnupg_process_wait (proc, 1 /* hang */);
+ err = gpgrt_process_wait (proc, 1 /* hang */);
if (err)
{
log_error ("waiting for process %s failed: %s\n",
opt.gpg_program, gpg_strerror (err));
goto leave;
}
- gnupg_process_ctl (proc, GNUPG_PROCESS_GET_EXIT_ID, &exitcode);
+ gpgrt_process_ctl (proc, GPGRT_PROCESS_GET_EXIT_ID, &exitcode);
if (exitcode)
{
log_error ("running %s failed: exitcode=%d\n",
@@ -577,7 +576,7 @@ mail_tube_encrypt (estream_t fpin, strlist_t recipients)
goto leave;
}
- gnupg_process_release (proc);
+ gpgrt_process_release (proc);
proc = NULL;
/* Output the final boundary. */
@@ -597,7 +596,7 @@ mail_tube_encrypt (estream_t fpin, strlist_t recipients)
leave:
gpgrt_fcancel (gpginfp);
- gnupg_process_release (proc);
+ gpgrt_process_release (proc);
rfc822parse_cancel (ctx->msg);
xfree (boundary);
return err;
@@ -688,16 +687,16 @@ prepare_for_appimage (void)
{
/* Run the sleep program for 2^30 seconds (34 years). */
static const char *args[4] = { "-c", "sleep", "1073741824", NULL };
- gnupg_spawn_actions_t act;
+ gpgrt_spawn_actions_t act;
fname = make_filename ("~/.gnupg-vsd/gnupg-vs-desktop.AppImage", NULL);
- err = gnupg_spawn_actions_new (&act);
+ err = gpgrt_spawn_actions_new (&act);
if (!err)
{
- err = gnupg_process_spawn (fname, args,
- GNUPG_PROCESS_DETACHED, act, NULL);
- gnupg_spawn_actions_release (act);
+ err = gpgrt_process_spawn (fname, args,
+ GPGRT_PROCESS_DETACHED, act, NULL);
+ gpgrt_spawn_actions_release (act);
}
if (err)
{
@@ -730,7 +729,7 @@ prepare_for_appimage (void)
* is stored at R_INPUT and the process objectat R_PROC. The gpg
* output is sent to stdout and is always armored. */
static gpg_error_t
-start_gpg_encrypt (estream_t *r_input, gnupg_process_t *r_proc,
+start_gpg_encrypt (estream_t *r_input, gpgrt_process_t *r_proc,
strlist_t recipients)
{
gpg_error_t err;
@@ -742,7 +741,7 @@ start_gpg_encrypt (estream_t *r_input, gnupg_process_t *r_proc,
int except[2] = { -1, -1 };
#endif
const char **argv;
- gnupg_spawn_actions_t act = NULL;
+ gpgrt_spawn_actions_t act = NULL;
char *logfilebuf = NULL;
*r_input = NULL;
@@ -786,7 +785,7 @@ start_gpg_encrypt (estream_t *r_input, gnupg_process_t *r_proc,
goto leave;
}
- err = gnupg_spawn_actions_new (&act);
+ err = gpgrt_spawn_actions_new (&act);
if (err)
{
xfree (argv);
@@ -794,24 +793,24 @@ start_gpg_encrypt (estream_t *r_input, gnupg_process_t *r_proc,
}
#ifdef HAVE_W32_SYSTEM
- gnupg_spawn_actions_set_inherit_handles (act, except);
+ gpgrt_spawn_actions_set_inherit_handles (act, except);
#else
- gnupg_spawn_actions_set_inherit_fds (act, except);
+ gpgrt_spawn_actions_set_inherit_fds (act, except);
#endif
- err = gnupg_process_spawn (opt.gpg_program, argv,
- (GNUPG_PROCESS_STDIN_PIPE
- | GNUPG_PROCESS_STDOUT_KEEP
- | GNUPG_PROCESS_STDERR_KEEP), act, r_proc);
- gnupg_spawn_actions_release (act);
+ err = gpgrt_process_spawn (opt.gpg_program, argv,
+ (GPGRT_PROCESS_STDIN_PIPE
+ | GPGRT_PROCESS_STDOUT_KEEP
+ | GPGRT_PROCESS_STDERR_KEEP), act, r_proc);
+ gpgrt_spawn_actions_release (act);
xfree (argv);
if (err)
goto leave;
- gnupg_process_get_streams (*r_proc, 0, r_input, NULL, NULL);
+ gpgrt_process_get_streams (*r_proc, 0, r_input, NULL, NULL);
leave:
if (err)
{
- gnupg_process_release (*r_proc);
+ gpgrt_process_release (*r_proc);
*r_proc = NULL;
}
xfree (logfilebuf);
diff --git a/tools/gpgconf-comp.c b/tools/gpgconf-comp.c
index 23121b46f..21dd406ab 100644
--- a/tools/gpgconf-comp.c
+++ b/tools/gpgconf-comp.c
@@ -46,7 +46,6 @@
#include "../common/util.h"
#include "../common/i18n.h"
-#include "../common/exechelp.h"
#include "../common/sysutils.h"
#include "../common/status.h"
@@ -747,7 +746,7 @@ gpg_agent_runtime_change (int killflag)
gpg_error_t err = 0;
const char *pgmname;
const char *argv[5];
- gnupg_process_t proc = NULL;
+ gpgrt_process_t proc = NULL;
int i = 0;
int cmdidx;
@@ -764,13 +763,13 @@ gpg_agent_runtime_change (int killflag)
log_assert (i < DIM(argv));
if (!err)
- err = gnupg_process_spawn (pgmname, argv, 0, NULL, &proc);
+ err = gpgrt_process_spawn (pgmname, argv, 0, NULL, &proc);
if (!err)
- err = gnupg_process_wait (proc, 1);
+ err = gpgrt_process_wait (proc, 1);
if (err)
gc_error (0, 0, "error running '%s %s': %s",
pgmname, argv[cmdidx], gpg_strerror (err));
- gnupg_process_release (proc);
+ gpgrt_process_release (proc);
}
@@ -780,7 +779,7 @@ scdaemon_runtime_change (int killflag)
gpg_error_t err = 0;
const char *pgmname;
const char *argv[9];
- gnupg_process_t proc = NULL;
+ gpgrt_process_t proc = NULL;
int i = 0;
int cmdidx;
@@ -808,13 +807,13 @@ scdaemon_runtime_change (int killflag)
log_assert (i < DIM(argv));
if (!err)
- err = gnupg_process_spawn (pgmname, argv, 0, NULL, &proc);
+ err = gpgrt_process_spawn (pgmname, argv, 0, NULL, &proc);
if (!err)
- err = gnupg_process_wait (proc, 1);
+ err = gpgrt_process_wait (proc, 1);
if (err)
gc_error (0, 0, "error running '%s %s': %s",
pgmname, argv[cmdidx], gpg_strerror (err));
- gnupg_process_release (proc);
+ gpgrt_process_release (proc);
}
@@ -825,7 +824,7 @@ tpm2daemon_runtime_change (int killflag)
gpg_error_t err = 0;
const char *pgmname;
const char *argv[9];
- gnupg_process_t proc = NULL;
+ gpgrt_process_t proc = NULL;
int i = 0;
int cmdidx;
@@ -853,13 +852,13 @@ tpm2daemon_runtime_change (int killflag)
log_assert (i < DIM(argv));
if (!err)
- err = gnupg_process_spawn (pgmname, argv, 0, NULL, &proc);
+ err = gpgrt_process_spawn (pgmname, argv, 0, NULL, &proc);
if (!err)
- err = gnupg_process_wait (proc, 1);
+ err = gpgrt_process_wait (proc, 1);
if (err)
gc_error (0, 0, "error running '%s %s': %s",
pgmname, argv[cmdidx], gpg_strerror (err));
- gnupg_process_release (proc);
+ gpgrt_process_release (proc);
}
#endif
@@ -870,7 +869,7 @@ dirmngr_runtime_change (int killflag)
gpg_error_t err = 0;
const char *pgmname;
const char *argv[6];
- gnupg_process_t proc = NULL;
+ gpgrt_process_t proc = NULL;
int i = 0;
int cmdidx;
@@ -888,13 +887,13 @@ dirmngr_runtime_change (int killflag)
log_assert (i < DIM(argv));
if (!err)
- err = gnupg_process_spawn (pgmname, argv, 0, NULL, &proc);
+ err = gpgrt_process_spawn (pgmname, argv, 0, NULL, &proc);
if (!err)
- err = gnupg_process_wait (proc, 1);
+ err = gpgrt_process_wait (proc, 1);
if (err)
gc_error (0, 0, "error running '%s %s': %s",
pgmname, argv[cmdidx], gpg_strerror (err));
- gnupg_process_release (proc);
+ gpgrt_process_release (proc);
}
@@ -904,7 +903,7 @@ keyboxd_runtime_change (int killflag)
gpg_error_t err = 0;
const char *pgmname;
const char *argv[6];
- gnupg_process_t proc = NULL;
+ gpgrt_process_t proc = NULL;
int i = 0;
int cmdidx;
@@ -922,13 +921,13 @@ keyboxd_runtime_change (int killflag)
log_assert (i < DIM(argv));
if (!err)
- err = gnupg_process_spawn (pgmname, argv, 0, NULL, &proc);
+ err = gpgrt_process_spawn (pgmname, argv, 0, NULL, &proc);
if (!err)
- err = gnupg_process_wait (proc, 1);
+ err = gpgrt_process_wait (proc, 1);
if (err)
gc_error (0, 0, "error running '%s %s': %s",
pgmname, argv[cmdidx], gpg_strerror (err));
- gnupg_process_release (proc);
+ gpgrt_process_release (proc);
}
@@ -940,7 +939,7 @@ gc_component_launch (int component)
const char *pgmname;
const char *argv[6];
int i;
- gnupg_process_t proc = NULL;
+ gpgrt_process_t proc = NULL;
if (component < 0)
{
@@ -988,9 +987,9 @@ gc_component_launch (int component)
argv[i] = NULL;
log_assert (i < DIM(argv));
- err = gnupg_process_spawn (pgmname, argv, 0, NULL, &proc);
+ err = gpgrt_process_spawn (pgmname, argv, 0, NULL, &proc);
if (!err)
- err = gnupg_process_wait (proc, 1);
+ err = gpgrt_process_wait (proc, 1);
if (err)
gc_error (0, 0, "error running '%s%s%s': %s",
pgmname,
@@ -998,7 +997,7 @@ gc_component_launch (int component)
: component == GC_COMPONENT_KEYBOXD? " --keyboxd":"",
" NOP",
gpg_strerror (err));
- gnupg_process_release (proc);
+ gpgrt_process_release (proc);
return err;
}
@@ -1339,7 +1338,7 @@ gc_component_check_options (int component, estream_t out, const char *conf_file)
const char *pgmname;
const char *argv[6];
int i;
- gnupg_process_t proc;
+ gpgrt_process_t proc;
estream_t errfp;
error_line_t errlines;
@@ -1372,27 +1371,27 @@ gc_component_check_options (int component, estream_t out, const char *conf_file)
result = 0;
errlines = NULL;
- err = gnupg_process_spawn (pgmname, argv, GNUPG_PROCESS_STDERR_PIPE,
+ err = gpgrt_process_spawn (pgmname, argv, GPGRT_PROCESS_STDERR_PIPE,
NULL, &proc);
if (err)
result |= 1; /* Program could not be run. */
else
{
- gnupg_process_get_streams (proc, 0, NULL, NULL, &errfp);
+ gpgrt_process_get_streams (proc, 0, NULL, NULL, &errfp);
errlines = collect_error_output (errfp,
gc_component[component].name);
- if (!gnupg_process_wait (proc, 1))
+ if (!gpgrt_process_wait (proc, 1))
{
int exitcode;
- gnupg_process_ctl (proc, GNUPG_PROCESS_GET_EXIT_ID, &exitcode);
+ gpgrt_process_ctl (proc, GPGRT_PROCESS_GET_EXIT_ID, &exitcode);
if (exitcode == -1)
result |= 1; /* Program could not be run or it
terminated abnormally. */
else if (exitcode)
result |= 2; /* Program returned an error. */
}
- gnupg_process_release (proc);
+ gpgrt_process_release (proc);
es_fclose (errfp);
}
@@ -1732,7 +1731,7 @@ retrieve_options_from_program (gc_component_id_t component, int only_installed)
const char *pgmname;
const char *argv[2];
estream_t outfp;
- gnupg_process_t proc;
+ gpgrt_process_t proc;
known_option_t *known_option;
gc_option_t *option;
char *line = NULL;
@@ -1765,7 +1764,7 @@ retrieve_options_from_program (gc_component_id_t component, int only_installed)
/* First we need to read the option table from the program. */
argv[0] = "--dump-option-table";
argv[1] = NULL;
- err = gnupg_process_spawn (pgmname, argv, GNUPG_PROCESS_STDOUT_PIPE,
+ err = gpgrt_process_spawn (pgmname, argv, GPGRT_PROCESS_STDOUT_PIPE,
NULL, &proc);
if (err)
{
@@ -1773,7 +1772,7 @@ retrieve_options_from_program (gc_component_id_t component, int only_installed)
pgmname, gpg_strerror (err));
}
- gnupg_process_get_streams (proc, 0, NULL, &outfp, NULL);
+ gpgrt_process_get_streams (proc, 0, NULL, &outfp, NULL);
read_line_parm.pgmname = pgmname;
read_line_parm.fp = outfp;
@@ -1933,17 +1932,17 @@ retrieve_options_from_program (gc_component_id_t component, int only_installed)
line_len = read_line_parm.line_len;
log_assert (opt_table_used + pseudo_count == opt_info_used);
- err = gnupg_process_wait (proc, 1);
+ err = gpgrt_process_wait (proc, 1);
if (!err)
{
int exitcode;
- gnupg_process_ctl (proc, GNUPG_PROCESS_GET_EXIT_ID, &exitcode);
+ gpgrt_process_ctl (proc, GPGRT_PROCESS_GET_EXIT_ID, &exitcode);
if (exitcode)
gc_error (1, 0, "running %s failed (exitcode=%d): %s",
pgmname, exitcode, gpg_strerror (err));
}
- gnupg_process_release (proc);
+ gpgrt_process_release (proc);
/* Make the gpgrt option table and the internal option table available. */
gc_component[component].opt_table = opt_table;
@@ -1953,7 +1952,7 @@ retrieve_options_from_program (gc_component_id_t component, int only_installed)
/* Now read the default options. */
argv[0] = "--gpgconf-list";
argv[1] = NULL;
- err = gnupg_process_spawn (pgmname, argv, GNUPG_PROCESS_STDOUT_PIPE,
+ err = gpgrt_process_spawn (pgmname, argv, GPGRT_PROCESS_STDOUT_PIPE,
NULL, &proc);
if (err)
{
@@ -1961,7 +1960,7 @@ retrieve_options_from_program (gc_component_id_t component, int only_installed)
pgmname, gpg_strerror (err));
}
- gnupg_process_get_streams (proc, 0, NULL, &outfp, NULL);
+ gpgrt_process_get_streams (proc, 0, NULL, &outfp, NULL);
while ((length = es_read_line (outfp, &line, &line_len, NULL)) > 0)
{
@@ -2045,17 +2044,17 @@ retrieve_options_from_program (gc_component_id_t component, int only_installed)
if (es_fclose (outfp))
gc_error (1, errno, "error closing %s", pgmname);
- err = gnupg_process_wait (proc, 1);
+ err = gpgrt_process_wait (proc, 1);
if (!err)
{
int exitcode;
- gnupg_process_ctl (proc, GNUPG_PROCESS_GET_EXIT_ID, &exitcode);
+ gpgrt_process_ctl (proc, GPGRT_PROCESS_GET_EXIT_ID, &exitcode);
if (exitcode)
gc_error (1, 0, "running %s failed (exitcode=%d): %s",
pgmname, exitcode, gpg_strerror (err));
}
- gnupg_process_release (proc);
+ gpgrt_process_release (proc);
/* At this point, we can parse the configuration file. */
diff --git a/tools/gpgconf.c b/tools/gpgconf.c
index 697e9c903..554b011e5 100644
--- a/tools/gpgconf.c
+++ b/tools/gpgconf.c
@@ -33,7 +33,6 @@
#include "../common/sysutils.h"
#include "../common/init.h"
#include "../common/status.h"
-#include "../common/exechelp.h"
#include "../common/dotlock.h"
#ifdef HAVE_W32_SYSTEM
@@ -1303,7 +1302,7 @@ show_versions_via_dirmngr (estream_t fp)
const char *pgmname;
const char *argv[2];
estream_t outfp;
- gnupg_process_t proc;
+ gpgrt_process_t proc;
char *line = NULL;
size_t line_len = 0;
ssize_t length;
@@ -1311,7 +1310,7 @@ show_versions_via_dirmngr (estream_t fp)
pgmname = gnupg_module_name (GNUPG_MODULE_NAME_DIRMNGR);
argv[0] = "--gpgconf-versions";
argv[1] = NULL;
- err = gnupg_process_spawn (pgmname, argv, GNUPG_PROCESS_STDOUT_PIPE,
+ err = gpgrt_process_spawn (pgmname, argv, GPGRT_PROCESS_STDOUT_PIPE,
NULL, &proc);
if (err)
{
@@ -1320,7 +1319,7 @@ show_versions_via_dirmngr (estream_t fp)
return;
}
- gnupg_process_get_streams (proc, 0, NULL, &outfp, NULL);
+ gpgrt_process_get_streams (proc, 0, NULL, &outfp, NULL);
while ((length = es_read_line (outfp, &line, &line_len, NULL)) > 0)
{
/* Strip newline and carriage return, if present. */
@@ -1341,12 +1340,12 @@ show_versions_via_dirmngr (estream_t fp)
pgmname, gpg_strerror (err));
}
- err = gnupg_process_wait (proc, 1);
+ err = gpgrt_process_wait (proc, 1);
if (!err)
{
int exitcode;
- gnupg_process_ctl (proc, GNUPG_PROCESS_GET_EXIT_ID, &exitcode);
+ gpgrt_process_ctl (proc, GPGRT_PROCESS_GET_EXIT_ID, &exitcode);
if (exitcode)
{
log_error ("running %s failed (exitcode=%d): %s\n",
@@ -1354,7 +1353,7 @@ show_versions_via_dirmngr (estream_t fp)
es_fprintf (fp, "[error: can't get further info]\n");
}
}
- gnupg_process_release (proc);
+ gpgrt_process_release (proc);
xfree (line);
}
diff --git a/tools/gpgtar-create.c b/tools/gpgtar-create.c
index 825ac4df3..f78a9d586 100644
--- a/tools/gpgtar-create.c
+++ b/tools/gpgtar-create.c
@@ -39,7 +39,6 @@
#include "../common/i18n.h"
#include <gpg-error.h>
-#include "../common/exechelp.h"
#include "../common/sysutils.h"
#include "../common/ccparray.h"
#include "../common/membuf.h"
@@ -1069,7 +1068,7 @@ gpgtar_create (char **inpattern, const char *files_from, int null_names,
estream_t files_from_stream = NULL;
estream_t outstream = NULL;
int eof_seen = 0;
- gnupg_process_t proc = NULL;
+ gpgrt_process_t proc = NULL;
unsigned int skipped_open = 0;
memset (scanctrl, 0, sizeof *scanctrl);
@@ -1234,7 +1233,7 @@ gpgtar_create (char **inpattern, const char *files_from, int null_names,
int except[2] = { -1, -1 };
#endif
const char **argv;
- gnupg_spawn_actions_t act = NULL;
+ gpgrt_spawn_actions_t act = NULL;
/* '--encrypt' may be combined with '--symmetric', but 'encrypt'
* is set either way. Clear it if no recipients are specified.
@@ -1297,7 +1296,7 @@ gpgtar_create (char **inpattern, const char *files_from, int null_names,
goto leave;
}
- err = gnupg_spawn_actions_new (&act);
+ err = gpgrt_spawn_actions_new (&act);
if (err)
{
xfree (argv);
@@ -1305,20 +1304,20 @@ gpgtar_create (char **inpattern, const char *files_from, int null_names,
}
#ifdef HAVE_W32_SYSTEM
- gnupg_spawn_actions_set_inherit_handles (act, except);
+ gpgrt_spawn_actions_set_inherit_handles (act, except);
#else
- gnupg_spawn_actions_set_inherit_fds (act, except);
+ gpgrt_spawn_actions_set_inherit_fds (act, except);
#endif
- err = gnupg_process_spawn (opt.gpg_program, argv,
- (GNUPG_PROCESS_STDIN_PIPE
- | GNUPG_PROCESS_STDOUT_KEEP
- | GNUPG_PROCESS_STDERR_KEEP), act, &proc);
- gnupg_spawn_actions_release (act);
+ err = gpgrt_process_spawn (opt.gpg_program, argv,
+ (GPGRT_PROCESS_STDIN_PIPE
+ | GPGRT_PROCESS_STDOUT_KEEP
+ | GPGRT_PROCESS_STDERR_KEEP), act, &proc);
+ gpgrt_spawn_actions_release (act);
xfree (argv);
if (err)
goto leave;
/* Note that OUTSTREAM is our tar output which is fed to gpg. */
- gnupg_process_get_streams (proc, 0, &outstream, NULL, NULL);
+ gpgrt_process_get_streams (proc, 0, &outstream, NULL, NULL);
es_set_binary (outstream);
}
else if (opt.outfile) /* No crypto */
@@ -1364,17 +1363,17 @@ gpgtar_create (char **inpattern, const char *files_from, int null_names,
if (err)
log_error ("error closing pipe: %s\n", gpg_strerror (err));
- err = gnupg_process_wait (proc, 1);
+ err = gpgrt_process_wait (proc, 1);
if (!err)
{
int exitcode;
- gnupg_process_ctl (proc, GNUPG_PROCESS_GET_EXIT_ID, &exitcode);
+ gpgrt_process_ctl (proc, GPGRT_PROCESS_GET_EXIT_ID, &exitcode);
if (exitcode)
log_error ("running %s failed (exitcode=%d): %s",
opt.gpg_program, exitcode, gpg_strerror (err));
}
- gnupg_process_release (proc);
+ gpgrt_process_release (proc);
proc = NULL;
}
diff --git a/tools/gpgtar-extract.c b/tools/gpgtar-extract.c
index e93ffdc37..8793ecd33 100644
--- a/tools/gpgtar-extract.c
+++ b/tools/gpgtar-extract.c
@@ -31,7 +31,6 @@
#include "../common/i18n.h"
#include <gpg-error.h>
-#include "../common/exechelp.h"
#include "../common/sysutils.h"
#include "../common/ccparray.h"
#include "gpgtar.h"
@@ -339,7 +338,7 @@ gpgtar_extract (const char *filename, int decrypt)
char *dirname = NULL;
struct tarinfo_s tarinfo_buffer;
tarinfo_t tarinfo = &tarinfo_buffer;
- gnupg_process_t proc;
+ gpgrt_process_t proc;
char *logfilename = NULL;
unsigned long long notextracted;
@@ -390,7 +389,7 @@ gpgtar_extract (const char *filename, int decrypt)
int except[2] = { -1, -1 };
#endif
const char **argv;
- gnupg_spawn_actions_t act = NULL;
+ gpgrt_spawn_actions_t act = NULL;
ccparray_init (&ccp, 0);
if (opt.batch)
@@ -436,7 +435,7 @@ gpgtar_extract (const char *filename, int decrypt)
goto leave;
}
- err = gnupg_spawn_actions_new (&act);
+ err = gpgrt_spawn_actions_new (&act);
if (err)
{
xfree (argv);
@@ -444,18 +443,18 @@ gpgtar_extract (const char *filename, int decrypt)
}
#ifdef HAVE_W32_SYSTEM
- gnupg_spawn_actions_set_inherit_handles (act, except);
+ gpgrt_spawn_actions_set_inherit_handles (act, except);
#else
- gnupg_spawn_actions_set_inherit_fds (act, except);
+ gpgrt_spawn_actions_set_inherit_fds (act, except);
#endif
- err = gnupg_process_spawn (opt.gpg_program, argv,
- ((filename ? 0 : GNUPG_PROCESS_STDIN_KEEP)
- | GNUPG_PROCESS_STDOUT_PIPE), act, &proc);
- gnupg_spawn_actions_release (act);
+ err = gpgrt_process_spawn (opt.gpg_program, argv,
+ ((filename ? 0 : GPGRT_PROCESS_STDIN_KEEP)
+ | GPGRT_PROCESS_STDOUT_PIPE), act, &proc);
+ gpgrt_spawn_actions_release (act);
xfree (argv);
if (err)
goto leave;
- gnupg_process_get_streams (proc, 0, NULL, &stream, NULL);
+ gpgrt_process_get_streams (proc, 0, NULL, &stream, NULL);
es_set_binary (stream);
}
else if (filename)
@@ -502,17 +501,17 @@ gpgtar_extract (const char *filename, int decrypt)
if (err)
log_error ("error closing pipe: %s\n", gpg_strerror (err));
- err = gnupg_process_wait (proc, 1);
+ err = gpgrt_process_wait (proc, 1);
if (!err)
{
int exitcode;
- gnupg_process_ctl (proc, GNUPG_PROCESS_GET_EXIT_ID, &exitcode);
+ gpgrt_process_ctl (proc, GPGRT_PROCESS_GET_EXIT_ID, &exitcode);
if (exitcode)
log_error ("running %s failed (exitcode=%d): %s",
opt.gpg_program, exitcode, gpg_strerror (err));
}
- gnupg_process_release (proc);
+ gpgrt_process_release (proc);
proc = NULL;
}
diff --git a/tools/gpgtar-list.c b/tools/gpgtar-list.c
index 74706cddd..2ed5aa873 100644
--- a/tools/gpgtar-list.c
+++ b/tools/gpgtar-list.c
@@ -29,7 +29,6 @@
#include "../common/i18n.h"
#include <gpg-error.h>
#include "gpgtar.h"
-#include "../common/exechelp.h"
#include "../common/sysutils.h"
#include "../common/ccparray.h"
@@ -460,7 +459,7 @@ gpgtar_list (const char *filename, int decrypt)
strlist_t extheader = NULL;
struct tarinfo_s tarinfo_buffer;
tarinfo_t tarinfo = &tarinfo_buffer;
- gnupg_process_t proc = NULL;
+ gpgrt_process_t proc = NULL;
memset (&tarinfo_buffer, 0, sizeof tarinfo_buffer);
@@ -474,7 +473,7 @@ gpgtar_list (const char *filename, int decrypt)
int except[2] = { -1, -1 };
#endif
const char **argv;
- gnupg_spawn_actions_t act = NULL;
+ gpgrt_spawn_actions_t act = NULL;
ccparray_init (&ccp, 0);
if (opt.batch)
@@ -514,7 +513,7 @@ gpgtar_list (const char *filename, int decrypt)
goto leave;
}
- err = gnupg_spawn_actions_new (&act);
+ err = gpgrt_spawn_actions_new (&act);
if (err)
{
xfree (argv);
@@ -522,18 +521,18 @@ gpgtar_list (const char *filename, int decrypt)
}
#ifdef HAVE_W32_SYSTEM
- gnupg_spawn_actions_set_inherit_handles (act, except);
+ gpgrt_spawn_actions_set_inherit_handles (act, except);
#else
- gnupg_spawn_actions_set_inherit_fds (act, except);
+ gpgrt_spawn_actions_set_inherit_fds (act, except);
#endif
- err = gnupg_process_spawn (opt.gpg_program, argv,
- ((filename ? 0 : GNUPG_PROCESS_STDIN_KEEP)
- | GNUPG_PROCESS_STDOUT_PIPE), act, &proc);
- gnupg_spawn_actions_release (act);
+ err = gpgrt_process_spawn (opt.gpg_program, argv,
+ ((filename ? 0 : GPGRT_PROCESS_STDIN_KEEP)
+ | GPGRT_PROCESS_STDOUT_PIPE), act, &proc);
+ gpgrt_spawn_actions_release (act);
xfree (argv);
if (err)
goto leave;
- gnupg_process_get_streams (proc, 0, NULL, &stream, NULL);
+ gpgrt_process_get_streams (proc, 0, NULL, &stream, NULL);
es_set_binary (stream);
}
else if (filename) /* No decryption requested. */
@@ -580,16 +579,16 @@ gpgtar_list (const char *filename, int decrypt)
if (err)
log_error ("error closing pipe: %s\n", gpg_strerror (err));
- err = gnupg_process_wait (proc, 1);
+ err = gpgrt_process_wait (proc, 1);
if (!err)
{
int exitcode;
- gnupg_process_ctl (proc, GNUPG_PROCESS_GET_EXIT_ID, &exitcode);
+ gpgrt_process_ctl (proc, GPGRT_PROCESS_GET_EXIT_ID, &exitcode);
log_error ("running %s failed (exitcode=%d): %s",
opt.gpg_program, exitcode, gpg_strerror (err));
}
- gnupg_process_release (proc);
+ gpgrt_process_release (proc);
proc = NULL;
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-27 00:55:20 +0000