security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-01-05 12:31:50 +01:00
Code Activity

common: Add kludge to allow silencing gnupg_exec_tool_stream.

Browse Source 
* common/exectool.c (read_and_log_buffer_t): Take care of a --quiet
argument.
(gnupg_exec_tool_stream): Ditto.
--

If we pass --quiet to a program it should really shutup and the parent
should be quite as well.
This commit is contained in:
Werner Koch 2019-01-30 14:38:37 +01:00
parent 346a98fabe
commit 1fd3d864b4
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
common/exectool.c
View File

@ -53,6 +53,7 @@ typedef struct
exec_tool_status_cb_t status_cb; exec_tool_status_cb_t status_cb;
void *status_cb_value; void *status_cb_value;
int cont; int cont;
int quiet;
size_t used; size_t used;
size_t buffer_size; size_t buffer_size;
char *buffer; char *buffer;
@ -110,6 +111,8 @@ read_and_log_stderr (read_and_log_buffer_t *state, es_poll_t *fderr)
state->status_cb (state->status_cb_value, state->status_cb (state->status_cb_value,
state->buffer + 9, rest); state->buffer + 9, rest);
} }
else if (state->quiet)
;
else if (!state->cont else if (!state->cont
&& !strncmp (state->buffer, pname, len) && !strncmp (state->buffer, pname, len)
&& strlen (state->buffer) > strlen (pname) && strlen (state->buffer) > strlen (pname)
@ -331,10 +334,16 @@ gnupg_exec_tool_stream (const char *pgmname, const char *argv[],
int count; int count;
read_and_log_buffer_t fderrstate; read_and_log_buffer_t fderrstate;
struct copy_buffer *cpbuf_in = NULL, *cpbuf_out = NULL, *cpbuf_extra = NULL; struct copy_buffer *cpbuf_in = NULL, *cpbuf_out = NULL, *cpbuf_extra = NULL;
int quiet = 0;
int dummy_exitcode;
memset (fds, 0, sizeof fds); memset (fds, 0, sizeof fds);
memset (&fderrstate, 0, sizeof fderrstate); memset (&fderrstate, 0, sizeof fderrstate);
/* If the first argument to the program is "--quiet" avoid all extra
* diagnostics. */
quiet = (argv && argv[0] && !strcmp (argv[0], "--quiet"));
cpbuf_in = xtrymalloc (sizeof *cpbuf_in); cpbuf_in = xtrymalloc (sizeof *cpbuf_in);
if (cpbuf_in == NULL) if (cpbuf_in == NULL)
{ {
@ -360,6 +369,7 @@ gnupg_exec_tool_stream (const char *pgmname, const char *argv[],
copy_buffer_init (cpbuf_extra); copy_buffer_init (cpbuf_extra);
fderrstate.pgmname = pgmname; fderrstate.pgmname = pgmname;
fderrstate.quiet = quiet;
fderrstate.status_cb = status_cb; fderrstate.status_cb = status_cb;
fderrstate.status_cb_value = status_cb_value; fderrstate.status_cb_value = status_cb_value;
fderrstate.buffer_size = 256; fderrstate.buffer_size = 256;
@ -375,7 +385,7 @@ gnupg_exec_tool_stream (const char *pgmname, const char *argv[],
err = gnupg_create_outbound_pipe (extrapipe, &extrafp, 1); err = gnupg_create_outbound_pipe (extrapipe, &extrafp, 1);
if (err) if (err)
{ {
log_error ("error running outbound pipe for extra fp: %s\n", log_error ("error creating outbound pipe for extra fp: %s\n",
gpg_strerror (err)); gpg_strerror (err));
goto leave; goto leave;
} }
@ -411,6 +421,7 @@ gnupg_exec_tool_stream (const char *pgmname, const char *argv[],
argv[argsaveidx] = argsave; argv[argsaveidx] = argsave;
if (err) if (err)
{ {
if (!quiet)
log_error ("error running '%s': %s\n", pgmname, gpg_strerror (err)); log_error ("error running '%s': %s\n", pgmname, gpg_strerror (err));
goto leave; goto leave;
} }
@ -535,7 +546,7 @@ gnupg_exec_tool_stream (const char *pgmname, const char *argv[],
es_fclose (outfp); outfp = NULL; es_fclose (outfp); outfp = NULL;
es_fclose (errfp); errfp = NULL; es_fclose (errfp); errfp = NULL;
err = gnupg_wait_process (pgmname, pid, 1, NULL); err = gnupg_wait_process (pgmname, pid, 1, quiet? &dummy_exitcode : NULL);
pid = (pid_t)(-1); pid = (pid_t)(-1);
leave: leave:
@ -547,7 +558,7 @@ gnupg_exec_tool_stream (const char *pgmname, const char *argv[],
es_fclose (outfp); es_fclose (outfp);
es_fclose (errfp); es_fclose (errfp);
if (pid != (pid_t)(-1)) if (pid != (pid_t)(-1))
gnupg_wait_process (pgmname, pid, 1, NULL); gnupg_wait_process (pgmname, pid, 1, quiet? &dummy_exitcode : NULL);
gnupg_release_process (pid); gnupg_release_process (pid);
copy_buffer_shred (cpbuf_in); copy_buffer_shred (cpbuf_in);