lib-compression: istream-zlib/lzma now differentiates between temporary errors and...

diff --git a/src/lib-compression/istream-lzma.c b/src/lib-compression/istream-lzma.c
index 20bb93b17ea0c1cd81dc1cd12ecf108d5fd11585..8ead55128e63dcabbb7e1ac6c8093b3a665182c8 100644 (file)
--- a/src/lib-compression/istream-lzma.c
+++ b/src/lib-compression/istream-lzma.c
@@ -153,7 +153,7 @@ static ssize_t i_stream_lzma_read(struct istream_private *stream)
                return -1;
        case LZMA_OPTIONS_ERROR:
                lzma_read_error(zstream, "Unsupported xz options");
-               stream->istream.stream_errno = EINVAL;
+               stream->istream.stream_errno = EIO;
                return -1;
        case LZMA_MEM_ERROR:
                i_fatal_status(FATAL_OUTOFMEM, "lzma.read(%s): Out of memory",
@@ -168,7 +168,7 @@ static ssize_t i_stream_lzma_read(struct istream_private *stream)
        default:
                lzma_read_error(zstream, t_strdup_printf(
                        "lzma_code() failed with %d", ret));
-               stream->istream.stream_errno = EINVAL;
+               stream->istream.stream_errno = EIO;
                return -1;
        }
        if (out_size == 0) {

diff --git a/src/lib-compression/istream-zlib.c b/src/lib-compression/istream-zlib.c
index b32a1d73e9b43af6e2e9d290f585759b73287b02..228095c422b9fca93f2f54730a57ff1acd91b998 100644 (file)
--- a/src/lib-compression/istream-zlib.c
+++ b/src/lib-compression/istream-zlib.c
@@ -282,7 +282,7 @@ static ssize_t i_stream_zlib_read(struct istream_private *stream)
                break;
        case Z_NEED_DICT:
                zlib_read_error(zstream, "can't read file without dict");
-               stream->istream.stream_errno = EINVAL;
+               stream->istream.stream_errno = EIO;
                return -1;
        case Z_DATA_ERROR:
                zlib_read_error(zstream, "corrupted data");