GpgFrontend/gpgme
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2008-08-08 Marcus Brinkmann <marcus@g10code.com>

Browse Source 
* rungpg.c (command_handler): Remove I/O callback on error, too.
This commit is contained in:
Marcus Brinkmann 2008-08-08 17:53:22 +00:00
parent 9c6bf32eea
commit 569829b6fd
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gpgme/ChangeLog
View File

@ -1,3 +1,7 @@
2008-08-08 Marcus Brinkmann <marcus@g10code.com>
* rungpg.c (command_handler): Remove I/O callback on error, too.
2008-06-29 Marcus Brinkmann <marcus@ulysses.g10code.com> 2008-06-29 Marcus Brinkmann <marcus@ulysses.g10code.com>
* gpgme.c (gpgme_cancel_async): Remove unused variable. * gpgme.c (gpgme_cancel_async): Remove unused variable.

13
gpgme/rungpg.c
View File

@ -645,12 +645,6 @@ command_handler (void *opaque, int fd)
err = gpg->cmd.fnc (gpg->cmd.fnc_value, gpg->cmd.code, gpg->cmd.keyword, fd, err = gpg->cmd.fnc (gpg->cmd.fnc_value, gpg->cmd.code, gpg->cmd.keyword, fd,
&processed); &processed);
if (err)
return err;
/* We always need to send at least a newline character. */
if (!processed)
_gpgme_io_write (fd, "\n", 1);
gpg->cmd.code = 0; gpg->cmd.code = 0;
/* And sleep again until read_status will wake us up again. */ /* And sleep again until read_status will wake us up again. */
@ -660,6 +654,13 @@ command_handler (void *opaque, int fd)
gpg->cmd.fd = gpg->fd_data_map[gpg->cmd.idx].fd; gpg->cmd.fd = gpg->fd_data_map[gpg->cmd.idx].fd;
gpg->fd_data_map[gpg->cmd.idx].fd = -1; gpg->fd_data_map[gpg->cmd.idx].fd = -1;
if (err)
return err;
/* We always need to send at least a newline character. */
if (!processed)
_gpgme_io_write (fd, "\n", 1);
return 0; return 0;
} }