security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-04-12 22:11:29 +02:00
Code Activity

Replace other use cases of gnupg_spawn_process_fd.

Browse Source 
--

 by gnupg_process_spawn

Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
This commit is contained in:
NIIBE Yutaka 2022-11-25 13:18:17 +09:00
parent 62496e9f30
commit 202d7b47e7
No known key found for this signature in database
GPG Key ID: 640114AF89DE6054
3 changed files with 58 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
common/asshelp.c
View File

@ -526,13 +526,11 @@ start_new_service (assuan_context_t *r_ctx,
err = gnupg_spawn_process_detached (program? program : program_name, err = gnupg_spawn_process_detached (program? program : program_name,
argv, NULL); argv, NULL);
#else /*!W32*/ #else /*!W32*/
pid_t pid; err = gnupg_process_spawn (program? program : program_name, argv,
(GNUPG_PROCESS_STDIN_NULL
err = gnupg_spawn_process_fd (program? program : program_name, |GNUPG_PROCESS_STDOUT_NULL
argv, -1, -1, -1, &pid); |GNUPG_PROCESS_STDERR_NULL),
if (!err) NULL, NULL, NULL);
err = gnupg_wait_process (program? program : program_name,
pid, 1, NULL);
#endif /*!W32*/ #endif /*!W32*/
if (err) if (err)
log_error ("failed to start %s '%s': %s\n", log_error ("failed to start %s '%s': %s\n",

9
g10/photoid.c
View File

@ -692,14 +692,15 @@ show_photo (const char *command, const char *name, const void *image, u32 len)
log_error (_("system error while calling external program: %s\n"), log_error (_("system error while calling external program: %s\n"),
strerror (errno)); strerror (errno));
#else #else
pid_t pid;
gpg_error_t err; gpg_error_t err;
const char *argv[4]; const char *argv[4];
fill_command_argv (argv, spawn->command); fill_command_argv (argv, spawn->command);
err = gnupg_spawn_process_fd (argv[0], argv+1, -1, -1, -1, &pid); err = gnupg_process_spawn (argv[0], argv+1,
if (!err) (GNUPG_PROCESS_STDIN_NULL
err = gnupg_wait_process (argv[0], pid, 1, NULL); |GNUPG_PROCESS_STDOUT_NULL
|GNUPG_PROCESS_STDERR_NULL),
NULL, NULL, NULL);
if (err) if (err)
log_error (_("unnatural exit of external program\n")); log_error (_("unnatural exit of external program\n"));
#endif #endif

72
tools/gpgconf-comp.c
View File

@ -744,7 +744,7 @@ gpg_agent_runtime_change (int killflag)
gpg_error_t err = 0; gpg_error_t err = 0;
const char *pgmname; const char *pgmname;
const char *argv[5]; const char *argv[5];
pid_t pid = (pid_t)(-1); gnupg_process_t proc = NULL;
int i = 0; int i = 0;
int cmdidx; int cmdidx;
@ -761,13 +761,17 @@ gpg_agent_runtime_change (int killflag)
log_assert (i < DIM(argv)); log_assert (i < DIM(argv));
if (!err) if (!err)
err = gnupg_spawn_process_fd (pgmname, argv, -1, -1, -1, &pid); err = gnupg_process_spawn (pgmname, argv,
(GNUPG_PROCESS_STDIN_NULL
|GNUPG_PROCESS_STDOUT_NULL
|GNUPG_PROCESS_STDERR_NULL),
NULL, NULL, &proc);
if (!err) if (!err)
err = gnupg_wait_process (pgmname, pid, 1, NULL); err = gnupg_process_wait (proc, 1);
if (err) if (err)
gc_error (0, 0, "error running '%s %s': %s", gc_error (0, 0, "error running '%s %s': %s",
pgmname, argv[cmdidx], gpg_strerror (err)); pgmname, argv[cmdidx], gpg_strerror (err));
gnupg_release_process (pid); gnupg_process_release (proc);
} }
@ -777,7 +781,7 @@ scdaemon_runtime_change (int killflag)
gpg_error_t err = 0; gpg_error_t err = 0;
const char *pgmname; const char *pgmname;
const char *argv[9]; const char *argv[9];
pid_t pid = (pid_t)(-1); gnupg_process_t proc = NULL;
int i = 0; int i = 0;
int cmdidx; int cmdidx;
@ -805,13 +809,17 @@ scdaemon_runtime_change (int killflag)
log_assert (i < DIM(argv)); log_assert (i < DIM(argv));
if (!err) if (!err)
err = gnupg_spawn_process_fd (pgmname, argv, -1, -1, -1, &pid); err = gnupg_process_spawn (pgmname, argv,
(GNUPG_PROCESS_STDIN_NULL
|GNUPG_PROCESS_STDOUT_NULL
|GNUPG_PROCESS_STDERR_NULL),
NULL, NULL, &proc);
if (!err) if (!err)
err = gnupg_wait_process (pgmname, pid, 1, NULL); err = gnupg_process_wait (proc, 1);
if (err) if (err)
gc_error (0, 0, "error running '%s %s': %s", gc_error (0, 0, "error running '%s %s': %s",
pgmname, argv[cmdidx], gpg_strerror (err)); pgmname, argv[cmdidx], gpg_strerror (err));
gnupg_release_process (pid); gnupg_process_release (proc);
} }
@ -822,7 +830,7 @@ tpm2daemon_runtime_change (int killflag)
gpg_error_t err = 0; gpg_error_t err = 0;
const char *pgmname; const char *pgmname;
const char *argv[9]; const char *argv[9];
pid_t pid = (pid_t)(-1); gnupg_process_t proc = NULL;
int i = 0; int i = 0;
int cmdidx; int cmdidx;
@ -850,13 +858,17 @@ tpm2daemon_runtime_change (int killflag)
log_assert (i < DIM(argv)); log_assert (i < DIM(argv));
if (!err) if (!err)
err = gnupg_spawn_process_fd (pgmname, argv, -1, -1, -1, &pid); err = gnupg_process_spawn (pgmname, argv,
(GNUPG_PROCESS_STDIN_NULL
|GNUPG_PROCESS_STDOUT_NULL
|GNUPG_PROCESS_STDERR_NULL),
NULL, NULL, &proc);
if (!err) if (!err)
err = gnupg_wait_process (pgmname, pid, 1, NULL); err = gnupg_process_wait (proc, 1);
if (err) if (err)
gc_error (0, 0, "error running '%s %s': %s", gc_error (0, 0, "error running '%s %s': %s",
pgmname, argv[cmdidx], gpg_strerror (err)); pgmname, argv[cmdidx], gpg_strerror (err));
gnupg_release_process (pid); gnupg_process_release (proc);
} }
#endif #endif
@ -867,7 +879,7 @@ dirmngr_runtime_change (int killflag)
gpg_error_t err = 0; gpg_error_t err = 0;
const char *pgmname; const char *pgmname;
const char *argv[6]; const char *argv[6];
pid_t pid = (pid_t)(-1); gnupg_process_t proc = NULL;
int i = 0; int i = 0;
int cmdidx; int cmdidx;
@ -885,13 +897,17 @@ dirmngr_runtime_change (int killflag)
log_assert (i < DIM(argv)); log_assert (i < DIM(argv));
if (!err) if (!err)
err = gnupg_spawn_process_fd (pgmname, argv, -1, -1, -1, &pid); err = gnupg_process_spawn (pgmname, argv,
(GNUPG_PROCESS_STDIN_NULL
|GNUPG_PROCESS_STDOUT_NULL
|GNUPG_PROCESS_STDERR_NULL),
NULL, NULL, &proc);
if (!err) if (!err)
err = gnupg_wait_process (pgmname, pid, 1, NULL); err = gnupg_process_wait (proc, 1);
if (err) if (err)
gc_error (0, 0, "error running '%s %s': %s", gc_error (0, 0, "error running '%s %s': %s",
pgmname, argv[cmdidx], gpg_strerror (err)); pgmname, argv[cmdidx], gpg_strerror (err));
gnupg_release_process (pid); gnupg_process_release (proc);
} }
@ -901,7 +917,7 @@ keyboxd_runtime_change (int killflag)
gpg_error_t err = 0; gpg_error_t err = 0;
const char *pgmname; const char *pgmname;
const char *argv[6]; const char *argv[6];
pid_t pid = (pid_t)(-1); gnupg_process_t proc = NULL;
int i = 0; int i = 0;
int cmdidx; int cmdidx;
@ -919,13 +935,17 @@ keyboxd_runtime_change (int killflag)
log_assert (i < DIM(argv)); log_assert (i < DIM(argv));
if (!err) if (!err)
err = gnupg_spawn_process_fd (pgmname, argv, -1, -1, -1, &pid); err = gnupg_process_spawn (pgmname, argv,
(GNUPG_PROCESS_STDIN_NULL
|GNUPG_PROCESS_STDOUT_NULL
|GNUPG_PROCESS_STDERR_NULL),
NULL, NULL, &proc);
if (!err) if (!err)
err = gnupg_wait_process (pgmname, pid, 1, NULL); err = gnupg_process_wait (proc, 1);
if (err) if (err)
gc_error (0, 0, "error running '%s %s': %s", gc_error (0, 0, "error running '%s %s': %s",
pgmname, argv[cmdidx], gpg_strerror (err)); pgmname, argv[cmdidx], gpg_strerror (err));
gnupg_release_process (pid); gnupg_process_release (proc);
} }
@ -937,7 +957,7 @@ gc_component_launch (int component)
const char *pgmname; const char *pgmname;
const char *argv[6]; const char *argv[6];
int i; int i;
pid_t pid; gnupg_process_t proc = NULL;
if (component < 0) if (component < 0)
{ {
@ -985,9 +1005,13 @@ gc_component_launch (int component)
argv[i] = NULL; argv[i] = NULL;
log_assert (i < DIM(argv)); log_assert (i < DIM(argv));
err = gnupg_spawn_process_fd (pgmname, argv, -1, -1, -1, &pid); err = gnupg_process_spawn (pgmname, argv,
(GNUPG_PROCESS_STDIN_NULL
|GNUPG_PROCESS_STDOUT_NULL
|GNUPG_PROCESS_STDERR_NULL),
NULL, NULL, &proc);
if (!err) if (!err)
err = gnupg_wait_process (pgmname, pid, 1, NULL); err = gnupg_process_wait (proc, 1);
if (err) if (err)
gc_error (0, 0, "error running '%s%s%s': %s", gc_error (0, 0, "error running '%s%s%s': %s",
pgmname, pgmname,
@ -995,7 +1019,7 @@ gc_component_launch (int component)
: component == GC_COMPONENT_KEYBOXD? " --keyboxd":"", : component == GC_COMPONENT_KEYBOXD? " --keyboxd":"",
" NOP", " NOP",
gpg_strerror (err)); gpg_strerror (err));
gnupg_release_process (pid); gnupg_process_release (proc);
return err; return err;
} }