diff options
| author | David Oberhollenzer <david.oberhollenzer@sigma-star.at> | 2023-06-13 23:44:19 +0200 |
|---|---|---|
| committer | David Oberhollenzer <david.oberhollenzer@sigma-star.at> | 2023-06-15 14:09:56 +0200 |
| commit | fd5c9f1259d0191af57b20f06dda35e62acb6275 (patch) | |
| tree | e45b73872c40531c5c2fa9c3b07096e5827ac6ea /lib/io/src/xfrm/istream.c | |
| parent | 89cdef0859259fdea0165b0d3918777d1ed42955 (diff) | |
Overhaul sqfs_istream_t/sqfs_ostream_t error handling
Report an error number from the implementations, change the users to
forward that error number (which also means libtar write header/link
now returns an error code) and all subsequent binaries to use
sqfs_perror() instead of relying on the function to print an error
internally.
Also, make sure to preserve errno/GetLastError() in the implementations
and print out a stringified error in sqfs_perror() if the error code
indicates an I/O error.
Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
Diffstat (limited to 'lib/io/src/xfrm/istream.c')
| -rw-r--r-- | lib/io/src/xfrm/istream.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/lib/io/src/xfrm/istream.c b/lib/io/src/xfrm/istream.c index c499f6c..ee4b5bd 100644 --- a/lib/io/src/xfrm/istream.c +++ b/lib/io/src/xfrm/istream.c @@ -6,6 +6,7 @@ */ #include "../internal.h" #include "sqfs/io.h" +#include "sqfs/error.h" typedef struct istream_xfrm_t { sqfs_istream_t base; @@ -52,11 +53,8 @@ static int precache(sqfs_istream_t *base) BUFSZ - out_off, &in_off, &out_off, mode); - if (ret == XFRM_STREAM_ERROR) { - fprintf(stderr, "%s: internal error in decompressor.\n", - base->get_filename(base)); - return -1; - } + if (ret == XFRM_STREAM_ERROR) + return SQFS_ERROR_COMPRESSOR; xfrm->buffer_used = out_off; xfrm->wrapped->advance_buffer(xfrm->wrapped, in_off); |