2004-09-23 Marcus Brinkmann <marcus@g10code.de>

	* data.c (_gpgme_data_outbound_handler): Close the file descriptor
	if we get an EPIPE.

diff --git a/trunk/gpgme/ChangeLog b/trunk/gpgme/ChangeLog
index 039b197ed601b29b8b0a920ab3592f7a7e95ca78..57177e8fc9c999dc9be9c51c6499d3df84bbe29b 100644 (file)
--- a/trunk/gpgme/ChangeLog
+++ b/trunk/gpgme/ChangeLog
@@ -1,5 +1,8 @@
 2004-09-23  Marcus Brinkmann  <marcus@g10code.de>
 
+       * data.c (_gpgme_data_outbound_handler): Close the file descriptor
+       if we get an EPIPE.
+       
        * data-stream.c (stream_seek): Call ftello and return the current
        offset.
        * data.h (struct gpgme_data): Change type of data.mem.offset to
@@ -8,6 +11,7 @@
        callback.  If SEEK_CUR, adjust the offset by the pending buffer
        size.  Clear pending buffer on success.
 
+
 2004-09-14  Marcus Brinkmann  <marcus@g10code.de>
 
        * gpgme.m4: Add copyright notice.

diff --git a/trunk/gpgme/data.c b/trunk/gpgme/data.c
index aba1986b88a4d2e2e4e3ccb4881921fbca4525e7..e4e13a3efff7c227caacdd357d56538eb50c1e97 100644 (file)
--- a/trunk/gpgme/data.c
+++ b/trunk/gpgme/data.c
@@ -219,9 +219,19 @@ _gpgme_data_outbound_handler (void *opaque, int fd)
     }
 
   nwritten = _gpgme_io_write (fd, dh->pending, dh->pending_len);
-  if (nwritten == -1 && errno == EAGAIN )
+  if (nwritten == -1 && errno == EAGAIN)
     return 0;
 
+  if (nwritten == -1 && errno == EPIPE)
+    {
+      /* Not much we can do.  The other end closed the pipe, but we
+        still have data.  This should only ever happen if the other
+        end is going to tell us what happened on some other channel.
+        Silently close our end.  */
+      _gpgme_io_close (fd);
+      return 0;
+    }
+
   if (nwritten <= 0)
     return gpg_error_from_errno (errno);