aboutsummaryrefslogtreecommitdiffstats
path: root/tools/gpgconf-comp.c
diff options
context:
space:
mode:
Diffstat (limited to 'tools/gpgconf-comp.c')
-rw-r--r--tools/gpgconf-comp.c48
1 files changed, 9 insertions, 39 deletions
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)
{