2008-08-08 Marcus Brinkmann <marcus@g10code.com>
* rungpg.c (command_handler): Remove I/O callback on error, too.
This commit is contained in:
parent
9c6bf32eea
commit
569829b6fd
@ -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>
|
||||
|
||||
* gpgme.c (gpgme_cancel_async): Remove unused variable.
|
||||
|
@ -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,
|
||||
&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;
|
||||
/* 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->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;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user