security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-12-22 10:19:57 +01:00
Code Activity

Use gpgrt_process_spawn functions from libgpg-error.

Browse Source 
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
This commit is contained in:
NIIBE Yutaka 2024-07-02 14:12:29 +09:00
parent d78131490e
commit 19df973df0
No known key found for this signature in database
GPG Key ID: 640114AF89DE6054
25 changed files with 201 additions and 231 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
agent/genkey.c
View File

@ -27,7 +27,6 @@
#include "agent.h"
#include "../common/i18n.h"
#include "../common/exechelp.h"
#include "../common/sysutils.h"
@ -162,7 +161,7 @@ do_check_passphrase_pattern (ctrl_t ctrl, const char *pw, unsigned int flags)
const char *pgmname = gnupg_module_name (GNUPG_MODULE_NAME_CHECK_PATTERN);
estream_t stream_to_check_pattern = NULL;
const char *argv[10];
gnupg_process_t proc;
gpgrt_process_t proc;
int result, i;
const char *pattern;
char *patternfname;
@ -205,15 +204,15 @@ do_check_passphrase_pattern (ctrl_t ctrl, const char *pw, unsigned int flags)
argv[i] = NULL;
log_assert (i < sizeof argv);
if (gnupg_process_spawn (pgmname, argv,
GNUPG_PROCESS_STDIN_PIPE,
if (gpgrt_process_spawn (pgmname, argv,
GPGRT_PROCESS_STDIN_PIPE,
NULL, &proc))
result = 1; /* Execute error - assume password should no be used. */
else
{
int status;
gnupg_process_get_streams (proc, 0, &stream_to_check_pattern,
gpgrt_process_get_streams (proc, 0, &stream_to_check_pattern,
NULL, NULL);
es_set_binary (stream_to_check_pattern);
@ -226,13 +225,13 @@ do_check_passphrase_pattern (ctrl_t ctrl, const char *pw, unsigned int flags)
else
es_fflush (stream_to_check_pattern);
es_fclose (stream_to_check_pattern);
gnupg_process_wait (proc, 1);
gnupg_process_ctl (proc, GNUPG_PROCESS_GET_EXIT_ID, &status);
gpgrt_process_wait (proc, 1);
gpgrt_process_ctl (proc, GPGRT_PROCESS_GET_EXIT_ID, &status);
if (status)
result = 1; /* Helper returned an error - probably a match. */
else
result = 0; /* Success; i.e. no match. */
gnupg_process_release (proc);
gpgrt_process_release (proc);
}
xfree (patternfname);

7
common/asshelp.c
View File

@ -39,7 +39,6 @@
#include "i18n.h"
#include "util.h"
#include "exechelp.h"
#include "sysutils.h"
#include "status.h"
#include "membuf.h"
@ -524,10 +523,10 @@ start_new_service (assuan_context_t *r_ctx,
&& assuan_socket_connect (ctx, sockname, 0, connect_flags))
{
#ifdef HAVE_W32_SYSTEM
err = gnupg_process_spawn (program? program : program_name, argv,
GNUPG_PROCESS_DETACHED, NULL, NULL);
err = gpgrt_process_spawn (program? program : program_name, argv,
GPGRT_PROCESS_DETACHED, NULL, NULL);
#else /*!W32*/
err = gnupg_process_spawn (program? program : program_name, argv,
err = gpgrt_process_spawn (program? program : program_name, argv,
0, NULL, NULL);
#endif /*!W32*/
if (err)

33
common/exectool.c
View File

@ -43,9 +43,6 @@
#include "logging.h"
#include "membuf.h"
#include "mischelp.h"
#ifdef HAVE_W32_SYSTEM
#define NEED_STRUCT_SPAWN_CB_ARG 1
#endif
#include "exechelp.h"
#include "sysutils.h"
#include "util.h"
@ -324,7 +321,7 @@ gnupg_exec_tool_stream (const char *pgmname, const char *argv[],
void *status_cb_value)
{
gpg_error_t err;
gnupg_process_t proc = NULL;
gpgrt_process_t proc = NULL;
estream_t infp = NULL;
estream_t extrafp = NULL;
estream_t outfp = NULL, errfp = NULL;
@ -342,7 +339,7 @@ gnupg_exec_tool_stream (const char *pgmname, const char *argv[],
read_and_log_buffer_t fderrstate;
struct copy_buffer *cpbuf_in = NULL, *cpbuf_out = NULL, *cpbuf_extra = NULL;
int quiet = 0;
gnupg_spawn_actions_t act = NULL;
gpgrt_spawn_actions_t act = NULL;
int i = 0;
memset (fds, 0, sizeof fds);
@ -433,22 +430,22 @@ gnupg_exec_tool_stream (const char *pgmname, const char *argv[],
exceptclose[i] = -1;
#endif
err = gnupg_spawn_actions_new (&act);
err = gpgrt_spawn_actions_new (&act);
if (err)
goto leave;
#ifdef HAVE_W32_SYSTEM
gnupg_spawn_actions_set_inherit_handles (act, exceptclose);
gpgrt_spawn_actions_set_inherit_handles (act, exceptclose);
#else
gnupg_spawn_actions_set_inherit_fds (act, exceptclose);
gpgrt_spawn_actions_set_inherit_fds (act, exceptclose);
#endif
err = gnupg_process_spawn (pgmname, argv,
err = gpgrt_process_spawn (pgmname, argv,
((input
? GNUPG_PROCESS_STDIN_PIPE
? GPGRT_PROCESS_STDIN_PIPE
: 0)
| GNUPG_PROCESS_STDOUT_PIPE
| GNUPG_PROCESS_STDERR_PIPE), act, &proc);
gnupg_process_get_streams (proc, GNUPG_PROCESS_STREAM_NONBLOCK,
| GPGRT_PROCESS_STDOUT_PIPE
| GPGRT_PROCESS_STDERR_PIPE), act, &proc);
gpgrt_process_get_streams (proc, GPGRT_PROCESS_STREAM_NONBLOCK,
input? &infp : NULL, &outfp, &errfp);
if (extrapipe[0] != -1)
close (extrapipe[0]);
@ -581,26 +578,26 @@ gnupg_exec_tool_stream (const char *pgmname, const char *argv[],
es_fclose (outfp); outfp = NULL;
es_fclose (errfp); errfp = NULL;
err = gnupg_process_wait (proc, 1);
err = gpgrt_process_wait (proc, 1);
if (!err)
{ /* To be compatible to old wait_process. */
int status;
gnupg_process_ctl (proc, GNUPG_PROCESS_GET_EXIT_ID, &status);
gpgrt_process_ctl (proc, GPGRT_PROCESS_GET_EXIT_ID, &status);
if (status)
err = gpg_error (GPG_ERR_GENERAL);
}
leave:
if (err && proc)
gnupg_process_terminate (proc);
gpgrt_process_terminate (proc);
es_fclose (infp);
es_fclose (extrafp);
es_fclose (outfp);
es_fclose (errfp);
gnupg_process_release (proc);
gnupg_spawn_actions_release (act);
gpgrt_process_release (proc);
gpgrt_spawn_actions_release (act);
copy_buffer_shred (cpbuf_in);
xfree (cpbuf_in);

29
dirmngr/ldap-wrapper.c
View File

@ -60,7 +60,6 @@
#include <npth.h>
#include "dirmngr.h"
#include "../common/exechelp.h"
#include "misc.h"
#include "ldap-wrapper.h"
@ -87,7 +86,7 @@ struct wrapper_context_s
{
struct wrapper_context_s *next;
gnupg_process_t proc;/* The wrapper process. */
gpgrt_process_t proc;/* The wrapper process. */
int printable_pid; /* Helper to print diagnostics after the process has
* been cleaned up. */
estream_t fp; /* Connected with stdout of the ldap wrapper. */
@ -172,8 +171,8 @@ destroy_wrapper (struct wrapper_context_s *ctx)
{
if (ctx->proc)
{
gnupg_process_terminate (ctx->proc);
gnupg_process_release (ctx->proc);
gpgrt_process_terminate (ctx->proc);
gpgrt_process_release (ctx->proc);
}
ksba_reader_release (ctx->reader);
SAFE_CLOSE (ctx->fp);
@ -440,17 +439,17 @@ ldap_reaper_thread (void *dummy)
/* Check whether the process is still running. */
if (ctx->proc)
{
err = gnupg_process_wait (ctx->proc, 0);
err = gpgrt_process_wait (ctx->proc, 0);
if (!err)
{
int status;
gnupg_process_ctl (ctx->proc, GNUPG_PROCESS_GET_EXIT_ID,
gpgrt_process_ctl (ctx->proc, GPGRT_PROCESS_GET_EXIT_ID,
&status);
if (DBG_EXTPROG)
log_info (_("ldap wrapper %d ready"), ctx->printable_pid);
ctx->ready = 1;
gnupg_process_release (ctx->proc);
gpgrt_process_release (ctx->proc);
ctx->proc = NULL;
any_action = 1;
@ -472,7 +471,7 @@ ldap_reaper_thread (void *dummy)
/* Check whether we should terminate the process. */
if (ctx->proc && ctx->stamp != (time_t)(-1) && ctx->stamp < exptime)
{
gnupg_process_terminate (ctx->proc);
gpgrt_process_terminate (ctx->proc);
ctx->stamp = (time_t)(-1);
log_info (_("ldap wrapper %d stalled - killing\n"),
ctx->printable_pid);
@ -634,7 +633,7 @@ ldap_wrapper_connection_cleanup (ctrl_t ctrl)
ctx->ctrl->refcount--;
ctx->ctrl = NULL;
if (ctx->proc)
gnupg_process_terminate (ctx->proc);
gpgrt_process_terminate (ctx->proc);
if (ctx->fp_err)
log_info ("%s: reading from ldap wrapper %d failed: %s\n",
__func__, ctx->printable_pid, gpg_strerror (ctx->fp_err));
@ -792,7 +791,7 @@ gpg_error_t
ldap_wrapper (ctrl_t ctrl, ksba_reader_t *reader, const char *argv[])
{
gpg_error_t err;
gnupg_process_t process;
gpgrt_process_t process;
struct wrapper_context_s *ctx;
int i;
int j;
@ -848,9 +847,9 @@ ldap_wrapper (ctrl_t ctrl, ksba_reader_t *reader, const char *argv[])
return err;
}
err = gnupg_process_spawn (pgmname, arg_list,
(GNUPG_PROCESS_STDOUT_PIPE
| GNUPG_PROCESS_STDERR_PIPE),
err = gpgrt_process_spawn (pgmname, arg_list,
(GPGRT_PROCESS_STDOUT_PIPE
| GPGRT_PROCESS_STDERR_PIPE),
NULL, &process);
if (err)
{
@ -859,9 +858,9 @@ ldap_wrapper (ctrl_t ctrl, ksba_reader_t *reader, const char *argv[])
log_error ("error running '%s': %s\n", pgmname, gpg_strerror (err));
return err;
}
gnupg_process_get_streams (process, GNUPG_PROCESS_STREAM_NONBLOCK,
gpgrt_process_get_streams (process, GPGRT_PROCESS_STREAM_NONBLOCK,
NULL, &outfp, &errfp);
gnupg_process_ctl (process, GNUPG_PROCESS_GET_PROC_ID, &ctx->printable_pid);
gpgrt_process_ctl (process, GPGRT_PROCESS_GET_PROC_ID, &ctx->printable_pid);
ctx->proc = process;
ctx->fp = outfp;

1
dirmngr/ldap.c
View File

@ -31,7 +31,6 @@
#include <npth.h>
#include "dirmngr.h"
#include "../common/exechelp.h"
#include "crlfetch.h"
#include "ldapserver.h"
#include "misc.h"

1
g10/call-keyboxd.c
View File

@ -38,7 +38,6 @@
#include "../common/i18n.h"
#include "../common/asshelp.h"
#include "../common/host2net.h"
#include "../common/exechelp.h"
#include "../common/status.h"
#include "../kbx/kbx-client-util.h"
#include "keydb.h"

13
g10/photoid.c
View File

@ -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

19
g13/be-encfs.c
View File

@ -29,7 +29,6 @@
#include "../common/i18n.h"
#include "keyblob.h"
#include "../common/sysutils.h"
#include "../common/exechelp.h"
#include "runner.h"
#include "be-encfs.h"
@ -81,8 +80,8 @@ run_umount_helper (const char *mountpoint)
args[1] = mountpoint;
args[2] = NULL;
err = gnupg_process_spawn (pgmname, args,
GNUPG_PROCESS_DETACHED,
err = gpgrt_process_spawn (pgmname, args,
GPGRT_PROCESS_DETACHED,
NULL, NULL);
if (err)
log_error ("failed to run '%s': %s\n",
@ -223,7 +222,7 @@ run_encfs_tool (ctrl_t ctrl, enum encfs_cmds cmd,
const char *pgmname;
const char *argv[10];
int idx;
gnupg_process_t proc;
gpgrt_process_t proc;
int inbound, outbound;
(void)ctrl;
@ -259,9 +258,9 @@ run_encfs_tool (ctrl_t ctrl, enum encfs_cmds cmd,
argv[idx++] = NULL;
assert (idx <= DIM (argv));
err = gnupg_process_spawn (pgmname, argv,
(GNUPG_PROCESS_STDIN_PIPE
| GNUPG_PROCESS_STDERR_PIPE),
err = gpgrt_process_spawn (pgmname, argv,
(GPGRT_PROCESS_STDIN_PIPE
| GPGRT_PROCESS_STDERR_PIPE),
NULL, &proc);
if (err)
{
@ -269,11 +268,11 @@ run_encfs_tool (ctrl_t ctrl, enum encfs_cmds cmd,
goto leave;
}
err = gnupg_process_get_fds (proc, 0, &outbound, NULL, &inbound);
err = gpgrt_process_get_fds (proc, 0, &outbound, NULL, &inbound);
if (err)
{
log_error ("error get fds '%s': %s\n", pgmname, gpg_strerror (err));
gnupg_process_release (proc);
gpgrt_process_release (proc);
goto leave;
}
@ -287,7 +286,7 @@ run_encfs_tool (ctrl_t ctrl, enum encfs_cmds cmd,
err = runner_spawn (runner);
if (err)
{
gnupg_process_release (proc);
gpgrt_process_release (proc);
goto leave;
}

1
g13/g13.c
View File

@ -40,7 +40,6 @@
#include "../common/gc-opt-flags.h"
#include "../common/asshelp.h"
#include "../common/init.h"
#include "../common/exechelp.h"
#include "keyblob.h"
#include "server.h"
#include "runner.h"

1
g13/mount.c
View File

@ -37,7 +37,6 @@
#include "../common/host2net.h"
#include "server.h" /*(g13_keyblob_decrypt)*/
#include "../common/sysutils.h"
#include "../common/exechelp.h"
#include "runner.h"
#include "call-syshelp.h"

1
g13/runner.c
View File

@ -29,7 +29,6 @@
#include "g13.h"
#include "../common/i18n.h"
#include "keyblob.h"
#include "../common/exechelp.h"
#include "runner.h"
#include "mountinfo.h"

1
scd/apdu.c
View File

@ -43,7 +43,6 @@
#if defined(GNUPG_MAJOR_VERSION)
# include "scdaemon.h"
# include "../common/exechelp.h"
#endif /*GNUPG_MAJOR_VERSION*/
#include "../common/host2net.h"

10
scd/app.c
View File

@ -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",

1
sm/export.c
View File

@ -30,7 +30,6 @@
#include <ksba.h>
#include "keydb.h"
#include "../common/exechelp.h"
#include "../common/i18n.h"
#include "../common/sysutils.h"
#include "minip12.h"

1
sm/import.c
View File

@ -30,7 +30,6 @@
#include <ksba.h>
#include "keydb.h"
#include "../common/exechelp.h"
#include "../common/i18n.h"
#include "../common/sysutils.h"
#include "../kbx/keybox.h" /* for KEYBOX_FLAG_* */

55
tests/gpgscm/ffi.c
View File

@ -42,9 +42,6 @@
#endif
#include "../../common/util.h"
#ifdef HAVE_W32_SYSTEM
#define NEED_STRUCT_SPAWN_CB_ARG
#endif
#include "../../common/exechelp.h"
#include "../../common/sysutils.h"
@ -762,7 +759,7 @@ do_es_write (scheme *sc, pointer args)
struct proc_object_box
{
gnupg_process_t proc;
gpgrt_process_t proc;
};
static void
@ -772,7 +769,7 @@ proc_object_finalize (scheme *sc, void *data)
(void) sc;
if (!box->proc)
gnupg_process_release (box->proc);
gpgrt_process_release (box->proc);
xfree (box);
}
@ -792,7 +789,7 @@ static struct foreign_object_vtable proc_object_vtable =
};
static pointer
proc_wrap (scheme *sc, gnupg_process_t proc)
proc_wrap (scheme *sc, gpgrt_process_t proc)
{
struct proc_object_box *box = xmalloc (sizeof *box);
if (box == NULL)
@ -897,7 +894,7 @@ do_process_spawn_io (scheme *sc, pointer args)
char **argv;
size_t len;
unsigned int flags;
gnupg_process_t proc = NULL;
gpgrt_process_t proc = NULL;
estream_t infp;
#ifdef HAVE_W32_SYSTEM
HANDLE out_hd, err_hd;
@ -915,9 +912,9 @@ do_process_spawn_io (scheme *sc, pointer args)
FFI_ARG_OR_RETURN (sc, pointer, arguments, list, args);
FFI_ARG_OR_RETURN (sc, char *, a_input, string, args);
flags = (GNUPG_PROCESS_STDIN_PIPE
| GNUPG_PROCESS_STDOUT_PIPE
| GNUPG_PROCESS_STDERR_PIPE);
flags = (GPGRT_PROCESS_STDIN_PIPE
| GPGRT_PROCESS_STDOUT_PIPE
| GPGRT_PROCESS_STDERR_PIPE);
FFI_ARGS_DONE_OR_RETURN (sc, args);
err = ffi_list2argv (sc, arguments, &argv, &len);
@ -937,28 +934,28 @@ do_process_spawn_io (scheme *sc, pointer args)
fprintf (stderr, "\n");
}
err = gnupg_process_spawn (argv[0], (const char **) &argv[1],
err = gpgrt_process_spawn (argv[0], (const char **) &argv[1],
flags, NULL, &proc);
err = gnupg_process_get_streams (proc, 0, &infp, NULL, NULL);
err = gpgrt_process_get_streams (proc, 0, &infp, NULL, NULL);
err = es_write (infp, a_input, strlen (a_input), NULL);
es_fclose (infp);
if (err)
{
gnupg_process_release (proc);
gpgrt_process_release (proc);
xfree (argv);
FFI_RETURN_ERR (sc, err);
}
#ifdef HAVE_W32_SYSTEM
err = gnupg_process_ctl (proc, GNUPG_PROCESS_GET_HANDLES,
err = gpgrt_process_ctl (proc, GPGRT_PROCESS_GET_HANDLES,
NULL, &out_hd, &err_hd);
#else
err = gnupg_process_get_fds (proc, 0, NULL, &out_fd, &err_fd);
err = gpgrt_process_get_fds (proc, 0, NULL, &out_fd, &err_fd);
#endif
if (err)
{
gnupg_process_release (proc);
gpgrt_process_release (proc);
xfree (argv);
FFI_RETURN_ERR (sc, err);
}
@ -1101,11 +1098,11 @@ do_process_spawn_io (scheme *sc, pointer args)
}
#endif
err = gnupg_process_wait (proc, 1);
err = gpgrt_process_wait (proc, 1);
if (!err)
err = gnupg_process_ctl (proc, GNUPG_PROCESS_GET_EXIT_ID, &retcode);
err = gpgrt_process_ctl (proc, GPGRT_PROCESS_GET_EXIT_ID, &retcode);
gnupg_process_release (proc);
gpgrt_process_release (proc);
xfree (argv);
p0 = sc->vptr->mk_integer (sc, (unsigned long)retcode);
@ -1132,7 +1129,7 @@ do_process_spawn_io (scheme *sc, pointer args)
if (err_fd >= 0)
close (err_fd);
#endif
gnupg_process_release (proc);
gpgrt_process_release (proc);
xfree (argv);
FFI_RETURN_ERR (sc, err);
}
@ -1145,8 +1142,8 @@ do_process_spawn_fd (scheme *sc, pointer args)
char **argv;
size_t len;
int std_fds[3];
gnupg_process_t proc = NULL;
gnupg_spawn_actions_t act = NULL;
gpgrt_process_t proc = NULL;
gpgrt_spawn_actions_t act = NULL;
FFI_ARG_OR_RETURN (sc, pointer, arguments, list, args);
FFI_ARG_OR_RETURN (sc, int, std_fds[0], number, args);
@ -1171,7 +1168,7 @@ do_process_spawn_fd (scheme *sc, pointer args)
fprintf (stderr, " (%d %d %d)\n", std_fds[0], std_fds[1], std_fds[2]);
}
err = gnupg_spawn_actions_new (&act);
err = gpgrt_spawn_actions_new (&act);
if (err)
{
FFI_RETURN_ERR (sc, err);
@ -1193,13 +1190,13 @@ do_process_spawn_fd (scheme *sc, pointer args)
else
std_err = (HANDLE)_get_osfhandle (std_fds[2]);
gnupg_spawn_actions_set_redirect (act, std_in, std_out, std_err);
gpgrt_spawn_actions_set_redirect (act, std_in, std_out, std_err);
}
#else
gnupg_spawn_actions_set_redirect (act, std_fds[0], std_fds[1], std_fds[2]);
gpgrt_spawn_actions_set_redirect (act, std_fds[0], std_fds[1], std_fds[2]);
#endif
err = gnupg_process_spawn (argv[0], (const char **)&argv[1], 0, act, &proc);
gnupg_spawn_actions_release (act);
err = gpgrt_process_spawn (argv[0], (const char **)&argv[1], 0, act, &proc);
gpgrt_spawn_actions_release (act);
xfree (argv);
FFI_RETURN_POINTER (sc, proc_wrap (sc, proc));
}
@ -1215,9 +1212,9 @@ do_process_wait (scheme *sc, pointer args)
FFI_ARG_OR_RETURN (sc, struct proc_object_box *, box, proc, args);
FFI_ARG_OR_RETURN (sc, int, hang, bool, args);
FFI_ARGS_DONE_OR_RETURN (sc, args);
err = gnupg_process_wait (box->proc, hang);
err = gpgrt_process_wait (box->proc, hang);
if (!err)
err = gnupg_process_ctl (box->proc, GNUPG_PROCESS_GET_EXIT_ID, &retcode);
err = gpgrt_process_ctl (box->proc, GPGRT_PROCESS_GET_EXIT_ID, &retcode);
if (err == GPG_ERR_TIMEOUT)
err = 0;

1
tools/gpg-auth.c
View File

@ -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. */

13
tools/gpg-card.c
View File

@ -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);
}

3
tools/gpg-connect-agent.c
View File

@ -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"

47
tools/gpg-mail-tube.c
View File

@ -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);

83
tools/gpgconf-comp.c
View File

@ -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. */

13
tools/gpgconf.c
View File

@ -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,17 +1340,17 @@ 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);
log_error ("running %s failed (exitcode=%d): %s\n",
pgmname, exitcode, gpg_strerror (err));
es_fprintf (fp, "[error: can't get further info]\n");
}
gnupg_process_release (proc);
gpgrt_process_release (proc);
xfree (line);
}

29
tools/gpgtar-create.c
View File

@ -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;
}

27
tools/gpgtar-extract.c
View File

@ -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;
}

27
tools/gpgtar-list.c
View File

@ -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;
}