security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-11-10 21:38:50 +01:00
Code Activity

common: Clarify use of vars in buffer copy code.

Browse Source 
* common/exectool.c (my_error_from_errno): New.
(copy_buffer_do_copy): Use separate vars for errno values and
gpg-error values for clarity.  s/assert/log_assert/.
(copy_buffer_flush): Ditto.
(gnupg_exec_tool_stream): Use gpg_err_code when testing.
--

NB: It is surprising that es_write seems not to set ERRNO but only
returns the ERRNO value.  Need to check whether this is really the
case.

Signed-off-by: Werner Koch <wk@gnupg.org>
This commit is contained in:
Werner Koch 2017-01-19 09:57:27 +01:00
parent 367349b4dc
commit 55c9212a23
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
1 changed files with 26 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
common/exectool.c
View File

@ -65,6 +65,12 @@ my_error_from_syserror (void)
return gpg_err_make (default_errsource, gpg_err_code_from_syserror ()); return gpg_err_make (default_errsource, gpg_err_code_from_syserror ());
} }
static inline gpg_error_t
my_error_from_errno (int rc)
{
return gpg_err_make (default_errsource, gpg_err_code_from_errno (rc));
}
static void static void
read_and_log_stderr (read_and_log_buffer_t *state, es_poll_t *fderr) read_and_log_stderr (read_and_log_buffer_t *state, es_poll_t *fderr)
@ -226,42 +232,44 @@ copy_buffer_shred (struct copy_buffer *c)
static gpg_error_t static gpg_error_t
copy_buffer_do_copy (struct copy_buffer *c, estream_t source, estream_t sink) copy_buffer_do_copy (struct copy_buffer *c, estream_t source, estream_t sink)
{ {
int rc;
gpg_error_t err; gpg_error_t err;
size_t nwritten = 0; size_t nwritten = 0;
if (c->nread == 0) if (c->nread == 0)
{ {
c->writep = c->buffer; c->writep = c->buffer;
err = es_read (source, c->buffer, sizeof c->buffer, &c->nread); rc = es_read (source, c->buffer, sizeof c->buffer, &c->nread);
if (err) if (rc)
{ {
if (errno == EAGAIN) err = my_error_from_syserror ();
if (gpg_err_code (err) == GPG_ERR_EAGAIN)
return 0; /* We will just retry next time. */ return 0; /* We will just retry next time. */
return my_error_from_syserror (); return err;
} }
assert (c->nread <= sizeof c->buffer); log_assert (c->nread <= sizeof c->buffer);
} }
if (c->nread == 0) if (c->nread == 0)
return 0; /* Done copying. */ return 0; /* Done copying. */
nwritten = 0; nwritten = 0;
err = sink? es_write (sink, c->writep, c->nread, &nwritten) : 0; rc = sink? es_write (sink, c->writep, c->nread, &nwritten) : 0;
err = rc? my_error_from_errno (rc) : 0;
assert (nwritten <= c->nread); log_assert (nwritten <= c->nread);
c->writep += nwritten; c->writep += nwritten;
c->nread -= nwritten; c->nread -= nwritten;
assert (c->writep - c->buffer <= sizeof c->buffer); log_assert (c->writep - c->buffer <= sizeof c->buffer);
if (err) if (err)
{ {
if (errno == EAGAIN) if (gpg_err_code (err) == GPG_ERR_EAGAIN)
return 0; /* We will just retry next time. */ return 0; /* We will just retry next time. */
return my_error_from_syserror (); return err;
} }
if (sink && es_fflush (sink) && errno != EAGAIN) if (sink && es_fflush (sink) && errno != EAGAIN)
@ -275,16 +283,18 @@ copy_buffer_do_copy (struct copy_buffer *c, estream_t source, estream_t sink)
static gpg_error_t static gpg_error_t
copy_buffer_flush (struct copy_buffer *c, estream_t sink) copy_buffer_flush (struct copy_buffer *c, estream_t sink)
{ {
int rc;
gpg_error_t err; gpg_error_t err;
size_t nwritten; size_t nwritten;
nwritten = 0; nwritten = 0;
err = es_write (sink, c->writep, c->nread, &nwritten); rc = es_write (sink, c->writep, c->nread, &nwritten);
err = rc? my_error_from_errno (rc) : 0;
assert (nwritten <= c->nread); log_assert (nwritten <= c->nread);
c->writep += nwritten; c->writep += nwritten;
c->nread -= nwritten; c->nread -= nwritten;
assert (c->writep - c->buffer <= sizeof c->buffer); log_assert (c->writep - c->buffer <= sizeof c->buffer);
if (err) if (err)
return err; return err;
@ -452,7 +462,7 @@ gnupg_exec_tool_stream (const char *pgmname, const char *argv[],
if (es_feof (input)) if (es_feof (input))
{ {
err = copy_buffer_flush (cpbuf_in, fds[0].stream); err = copy_buffer_flush (cpbuf_in, fds[0].stream);
if (err == GPG_ERR_EAGAIN) if (gpg_err_code (err) == GPG_ERR_EAGAIN)
continue; /* Retry next time. */ continue; /* Retry next time. */
if (err) if (err)
{ {
@ -480,7 +490,7 @@ gnupg_exec_tool_stream (const char *pgmname, const char *argv[],
if (es_feof (inextra)) if (es_feof (inextra))
{ {
err = copy_buffer_flush (cpbuf_extra, fds[3].stream); err = copy_buffer_flush (cpbuf_extra, fds[3].stream);
if (err == GPG_ERR_EAGAIN) if (gpg_err_code (err) == GPG_ERR_EAGAIN)
continue; /* Retry next time. */ continue; /* Retry next time. */
if (err) if (err)
{ {