diff options
| author | Marcus Brinkmann <[email protected]> | 2008-08-08 17:53:22 +0000 |
|---|---|---|
| committer | Marcus Brinkmann <[email protected]> | 2008-08-08 17:53:22 +0000 |
| commit | 6cf36cb2fdd7fcd38ee60b62f404be88e81dfa1a (patch) | |
| tree | d96e8bf836a23259e965bcbc5a2305ef9ada42c5 | |
| parent | Add a module overview diagram. (diff) | |
| download | gpgme-6cf36cb2fdd7fcd38ee60b62f404be88e81dfa1a.tar.gz gpgme-6cf36cb2fdd7fcd38ee60b62f404be88e81dfa1a.zip | |
2008-08-08 Marcus Brinkmann <[email protected]>
* rungpg.c (command_handler): Remove I/O callback on error, too.
| -rw-r--r-- | trunk/gpgme/ChangeLog | 4 | ||||
| -rw-r--r-- | trunk/gpgme/rungpg.c | 13 |
2 files changed, 11 insertions, 6 deletions
diff --git a/trunk/gpgme/ChangeLog b/trunk/gpgme/ChangeLog index 39c6165f..4629cc24 100644 --- a/trunk/gpgme/ChangeLog +++ b/trunk/gpgme/ChangeLog @@ -1,3 +1,7 @@ +2008-08-08 Marcus Brinkmann <[email protected]> + + * rungpg.c (command_handler): Remove I/O callback on error, too. + 2008-06-29 Marcus Brinkmann <[email protected]> * gpgme.c (gpgme_cancel_async): Remove unused variable. diff --git a/trunk/gpgme/rungpg.c b/trunk/gpgme/rungpg.c index 51ca545b..ca4145ca 100644 --- a/trunk/gpgme/rungpg.c +++ b/trunk/gpgme/rungpg.c @@ -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; } |