diff options
Diffstat (limited to 'tools/gpgtar-create.c')
| -rw-r--r-- | tools/gpgtar-create.c | 29 |
1 files changed, 14 insertions, 15 deletions
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; } |