iostreams: Set errno to stream_errno when exiting from failing functions.

diff --git a/src/lib/istream.c b/src/lib/istream.c
index bad7b3dc1772aae46dad406c7de61ed053c035c2..07a5eda9b86ab2932298ebfd2ea5210e19592933 100644 (file)
--- a/src/lib/istream.c
+++ b/src/lib/istream.c
@@ -115,8 +115,10 @@ ssize_t i_stream_read(struct istream *stream)
        size_t old_size;
        ssize_t ret;
 
-       if (unlikely(stream->closed))
+       if (unlikely(stream->closed)) {
+               errno = stream->stream_errno;
                return -1;
+       }
 
        stream->eof = FALSE;
        stream->stream_errno = 0;
@@ -135,6 +137,7 @@ ssize_t i_stream_read(struct istream *stream)
                        /* error handling should be easier if we now just
                           assume the stream is now at EOF */
                        stream->eof = TRUE;
+                       errno = stream->stream_errno;
                } else {
                        i_assert(stream->eof);
                }

diff --git a/src/lib/ostream.c b/src/lib/ostream.c
index c68fa210c08e3e729920a5a639f0c5f5ed972319..6395702b07a810a466c3a890169b8045668563fb 100644 (file)
--- a/src/lib/ostream.c
+++ b/src/lib/ostream.c
@@ -88,13 +88,16 @@ int o_stream_flush(struct ostream *stream)
        struct ostream_private *_stream = stream->real_stream;
        int ret = 1;
 
-       if (unlikely(stream->closed))
+       if (unlikely(stream->closed)) {
+               errno = stream->stream_errno;
                return -1;
+       }
 
        stream->stream_errno = 0;
        if (unlikely((ret = _stream->flush(_stream)) < 0)) {
                i_assert(stream->stream_errno != 0);
                stream->last_failed_errno = stream->stream_errno;
+               errno = stream->stream_errno;
        }
        return ret;
 }
@@ -128,13 +131,16 @@ int o_stream_seek(struct ostream *stream, uoff_t offset)
 {
        struct ostream_private *_stream = stream->real_stream;
 
-       if (unlikely(stream->closed))
+       if (unlikely(stream->closed)) {
+               errno = stream->stream_errno;
                return -1;
+       }
 
        stream->stream_errno = 0;
        if (unlikely(_stream->seek(_stream, offset) < 0)) {
                i_assert(stream->stream_errno != 0);
                stream->last_failed_errno = stream->stream_errno;
+               errno = stream->stream_errno;
                return -1;
        }
        return 1;
@@ -158,8 +164,10 @@ ssize_t o_stream_sendv(struct ostream *stream, const struct const_iovec *iov,
        size_t total_size;
        ssize_t ret;
 
-       if (unlikely(stream->closed))
+       if (unlikely(stream->closed)) {
+               errno = stream->stream_errno;
                return -1;
+       }
 
        stream->stream_errno = 0;
        for (i = 0, total_size = 0; i < iov_count; i++)
@@ -172,6 +180,7 @@ ssize_t o_stream_sendv(struct ostream *stream, const struct const_iovec *iov,
                if (ret < 0) {
                        i_assert(stream->stream_errno != 0);
                        stream->last_failed_errno = stream->stream_errno;
+                       errno = stream->stream_errno;
                } else {
                        stream->overflow = TRUE;
                }
@@ -190,13 +199,18 @@ off_t o_stream_send_istream(struct ostream *outstream,
        struct ostream_private *_outstream = outstream->real_stream;
        off_t ret;
 
-       if (unlikely(outstream->closed || instream->closed))
+       if (unlikely(outstream->closed || instream->closed)) {
+               errno = outstream->stream_errno;
                return -1;
+       }
 
        outstream->stream_errno = 0;
        ret = _outstream->send_istream(_outstream, instream);
-       if (unlikely(ret < 0))
+       if (unlikely(ret < 0)) {
+               i_assert(outstream->stream_errno != 0);
+               outstream->last_failed_errno = outstream->stream_errno;
                errno = outstream->stream_errno;
+       }
        return ret;
 }
 
@@ -205,14 +219,17 @@ int o_stream_pwrite(struct ostream *stream, const void *data, size_t size,
 {
        int ret;
 
-       if (unlikely(stream->closed))
+       if (unlikely(stream->closed)) {
+               errno = stream->stream_errno;
                return -1;
+       }
 
        ret = stream->real_stream->write_at(stream->real_stream,
                                            data, size, offset);
        if (unlikely(ret < 0)) {
                i_assert(stream->stream_errno != 0);
                stream->last_failed_errno = stream->stream_errno;
+               errno = stream->stream_errno;
        }
        return ret;
 }