diff options
| author | Werner Koch <[email protected]> | 2009-02-24 15:13:01 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2009-02-24 15:13:01 +0000 |
| commit | f0dccac380b172291e7bea8a43cb0ec44b49c3bf (patch) | |
| tree | 47b38e8ac4224c919c18c10175fd1ee3a4b0b34c /assuan | |
| parent | Fix spawn prototype for w32 glib and qt versions. (diff) | |
| download | gpgme-f0dccac380b172291e7bea8a43cb0ec44b49c3bf.tar.gz gpgme-f0dccac380b172291e7bea8a43cb0ec44b49c3bf.zip | |
Chnaged the op-assuan interface.
Diffstat (limited to 'assuan')
| -rw-r--r-- | assuan/ChangeLog | 5 | ||||
| -rw-r--r-- | assuan/assuan-buffer.c | 7 |
2 files changed, 10 insertions, 2 deletions
diff --git a/assuan/ChangeLog b/assuan/ChangeLog index cc39213c..e620d205 100644 --- a/assuan/ChangeLog +++ b/assuan/ChangeLog @@ -1,3 +1,8 @@ +2009-02-24 Werner Koch <[email protected]> + + * assuan-buffer.c (assuan_send_data): Add hack to optionally send + a final "CAN". + 2008-11-03 Marcus Brinkmann <[email protected]> * Makefile.am (INCLUDES): Replace gpgme path with src. diff --git a/assuan/assuan-buffer.c b/assuan/assuan-buffer.c index 1fad0b5e..31f33945 100644 --- a/assuan/assuan-buffer.c +++ b/assuan/assuan-buffer.c @@ -491,6 +491,9 @@ _assuan_cookie_write_flush (void *cookie) * a INQUIRE response. However, when assuan_transact() is used, this * function takes care of sending END itself. * + * If BUFFER is NULL and LENGTH is 1 and we are a client, a "CAN" is + * send instead of an "END". + * * Return value: 0 on success or an error code **/ @@ -499,7 +502,7 @@ assuan_send_data (assuan_context_t ctx, const void *buffer, size_t length) { if (!ctx) return _assuan_error (ASSUAN_Invalid_Value); - if (!buffer && length) + if (!buffer && length > 1) return _assuan_error (ASSUAN_Invalid_Value); if (!buffer) @@ -508,7 +511,7 @@ assuan_send_data (assuan_context_t ctx, const void *buffer, size_t length) if (ctx->outbound.data.error) return ctx->outbound.data.error; if (!ctx->is_server) - return assuan_write_line (ctx, "END"); + return assuan_write_line (ctx, length == 1? "CAN":"END"); } else { |