aboutsummaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
Diffstat (limited to 'tools')
-rw-r--r--tools/gpg-card.c6
-rw-r--r--tools/gpgconf-comp.c48
-rw-r--r--tools/gpgconf.c4
-rw-r--r--tools/gpgtar-create.c4
-rw-r--r--tools/gpgtar-extract.c2
-rw-r--r--tools/gpgtar-list.c2
6 files changed, 19 insertions, 47 deletions
diff --git a/tools/gpg-card.c b/tools/gpg-card.c
index 3034a14c5..919e61195 100644
--- a/tools/gpg-card.c
+++ b/tools/gpg-card.c
@@ -3670,8 +3670,10 @@ cmd_gpg (card_info_t info, char *argstr, int use_gpgsm)
}
err = gnupg_process_spawn (use_gpgsm? opt.gpgsm_program:opt.gpg_program,
- argv, GNUPG_PROCESS_STDIN_NULL, NULL, NULL,
- &proc);
+ argv,
+ (GNUPG_PROCESS_STDOUT_KEEP
+ | GNUPG_PROCESS_STDERR_KEEP),
+ NULL, NULL, &proc);
if (!err)
{
err = gnupg_process_wait (proc, 1);
diff --git a/tools/gpgconf-comp.c b/tools/gpgconf-comp.c
index f89ab3b9c..d6aa9d61b 100644
--- a/tools/gpgconf-comp.c
+++ b/tools/gpgconf-comp.c
@@ -761,11 +761,7 @@ gpg_agent_runtime_change (int killflag)
log_assert (i < DIM(argv));
if (!err)
- err = gnupg_process_spawn (pgmname, argv,
- (GNUPG_PROCESS_STDIN_NULL
- |GNUPG_PROCESS_STDOUT_NULL
- |GNUPG_PROCESS_STDERR_NULL),
- NULL, NULL, &proc);
+ err = gnupg_process_spawn (pgmname, argv, 0, NULL, NULL, &proc);
if (!err)
err = gnupg_process_wait (proc, 1);
if (err)
@@ -809,11 +805,7 @@ scdaemon_runtime_change (int killflag)
log_assert (i < DIM(argv));
if (!err)
- err = gnupg_process_spawn (pgmname, argv,
- (GNUPG_PROCESS_STDIN_NULL
- |GNUPG_PROCESS_STDOUT_NULL
- |GNUPG_PROCESS_STDERR_NULL),
- NULL, NULL, &proc);
+ err = gnupg_process_spawn (pgmname, argv, 0, NULL, NULL, &proc);
if (!err)
err = gnupg_process_wait (proc, 1);
if (err)
@@ -858,11 +850,7 @@ tpm2daemon_runtime_change (int killflag)
log_assert (i < DIM(argv));
if (!err)
- err = gnupg_process_spawn (pgmname, argv,
- (GNUPG_PROCESS_STDIN_NULL
- |GNUPG_PROCESS_STDOUT_NULL
- |GNUPG_PROCESS_STDERR_NULL),
- NULL, NULL, &proc);
+ err = gnupg_process_spawn (pgmname, argv, 0, NULL, NULL, &proc);
if (!err)
err = gnupg_process_wait (proc, 1);
if (err)
@@ -897,11 +885,7 @@ dirmngr_runtime_change (int killflag)
log_assert (i < DIM(argv));
if (!err)
- err = gnupg_process_spawn (pgmname, argv,
- (GNUPG_PROCESS_STDIN_NULL
- |GNUPG_PROCESS_STDOUT_NULL
- |GNUPG_PROCESS_STDERR_NULL),
- NULL, NULL, &proc);
+ err = gnupg_process_spawn (pgmname, argv, 0, NULL, NULL, &proc);
if (!err)
err = gnupg_process_wait (proc, 1);
if (err)
@@ -935,11 +919,7 @@ keyboxd_runtime_change (int killflag)
log_assert (i < DIM(argv));
if (!err)
- err = gnupg_process_spawn (pgmname, argv,
- (GNUPG_PROCESS_STDIN_NULL
- |GNUPG_PROCESS_STDOUT_NULL
- |GNUPG_PROCESS_STDERR_NULL),
- NULL, NULL, &proc);
+ err = gnupg_process_spawn (pgmname, argv, 0, NULL, NULL, &proc);
if (!err)
err = gnupg_process_wait (proc, 1);
if (err)
@@ -1005,11 +985,7 @@ gc_component_launch (int component)
argv[i] = NULL;
log_assert (i < DIM(argv));
- err = gnupg_process_spawn (pgmname, argv,
- (GNUPG_PROCESS_STDIN_NULL
- |GNUPG_PROCESS_STDOUT_NULL
- |GNUPG_PROCESS_STDERR_NULL),
- NULL, NULL, &proc);
+ err = gnupg_process_spawn (pgmname, argv, 0, NULL, NULL, &proc);
if (!err)
err = gnupg_process_wait (proc, 1);
if (err)
@@ -1394,9 +1370,7 @@ 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_STDIN_NULL
- | GNUPG_PROCESS_STDOUT_NULL
- | GNUPG_PROCESS_STDERR_PIPE),
+ GNUPG_PROCESS_STDERR_PIPE,
NULL, NULL, &proc);
if (err)
result |= 1; /* Program could not be run. */
@@ -1790,9 +1764,7 @@ retrieve_options_from_program (gc_component_id_t component, int only_installed)
argv[0] = "--dump-option-table";
argv[1] = NULL;
err = gnupg_process_spawn (pgmname, argv,
- (GNUPG_PROCESS_STDIN_NULL
- | GNUPG_PROCESS_STDOUT_PIPE
- | GNUPG_PROCESS_STDERR_NULL),
+ GNUPG_PROCESS_STDOUT_PIPE,
NULL, NULL, &proc);
if (err)
{
@@ -1981,9 +1953,7 @@ retrieve_options_from_program (gc_component_id_t component, int only_installed)
argv[0] = "--gpgconf-list";
argv[1] = NULL;
err = gnupg_process_spawn (pgmname, argv,
- (GNUPG_PROCESS_STDIN_NULL
- | GNUPG_PROCESS_STDOUT_PIPE
- | GNUPG_PROCESS_STDERR_NULL),
+ GNUPG_PROCESS_STDOUT_PIPE,
NULL, NULL, &proc);
if (err)
{
diff --git a/tools/gpgconf.c b/tools/gpgconf.c
index 46489df1f..522ce517b 100644
--- a/tools/gpgconf.c
+++ b/tools/gpgconf.c
@@ -1182,9 +1182,7 @@ show_versions_via_dirmngr (estream_t fp)
argv[0] = "--gpgconf-versions";
argv[1] = NULL;
err = gnupg_process_spawn (pgmname, argv,
- (GNUPG_PROCESS_STDIN_NULL
- | GNUPG_PROCESS_STDOUT_PIPE
- | GNUPG_PROCESS_STDERR_NULL),
+ GNUPG_PROCESS_STDOUT_PIPE,
NULL, NULL, &proc);
if (err)
{
diff --git a/tools/gpgtar-create.c b/tools/gpgtar-create.c
index c239b0fc6..e6f5b55a2 100644
--- a/tools/gpgtar-create.c
+++ b/tools/gpgtar-create.c
@@ -1285,7 +1285,9 @@ gpgtar_create (char **inpattern, const char *files_from, int null_names,
}
err = gnupg_process_spawn (opt.gpg_program, argv,
- GNUPG_PROCESS_STDIN_PIPE,
+ (GNUPG_PROCESS_STDIN_PIPE
+ | GNUPG_PROCESS_STDOUT_KEEP
+ | GNUPG_PROCESS_STDERR_KEEP),
gnupg_spawn_helper, except, &proc);
xfree (argv);
if (err)
diff --git a/tools/gpgtar-extract.c b/tools/gpgtar-extract.c
index c8e4a4571..be483f87c 100644
--- a/tools/gpgtar-extract.c
+++ b/tools/gpgtar-extract.c
@@ -426,7 +426,7 @@ gpgtar_extract (const char *filename, int decrypt)
}
err = gnupg_process_spawn (opt.gpg_program, argv,
- ((filename ? GNUPG_PROCESS_STDIN_NULL : 0)
+ ((filename ? 0 : GNUPG_PROCESS_STDIN_KEEP)
| GNUPG_PROCESS_STDOUT_PIPE),
gnupg_spawn_helper, except, &proc);
xfree (argv);
diff --git a/tools/gpgtar-list.c b/tools/gpgtar-list.c
index 6d824d35c..31bcd8d46 100644
--- a/tools/gpgtar-list.c
+++ b/tools/gpgtar-list.c
@@ -504,7 +504,7 @@ gpgtar_list (const char *filename, int decrypt)
}
err = gnupg_process_spawn (opt.gpg_program, argv,
- ((filename ? GNUPG_PROCESS_STDIN_NULL : 0)
+ ((filename ? 0 : GNUPG_PROCESS_STDIN_KEEP)
| GNUPG_PROCESS_STDOUT_PIPE),
gnupg_spawn_helper, except, &proc);
xfree (argv);
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-19 17:47:59 +0000