aboutsummaryrefslogtreecommitdiff
path: root/lib/io/src/xfrm
diff options
context:
space:
mode:
authorDavid Oberhollenzer <david.oberhollenzer@sigma-star.at>2023-06-13 23:44:19 +0200
committerDavid Oberhollenzer <david.oberhollenzer@sigma-star.at>2023-06-15 14:09:56 +0200
commitfd5c9f1259d0191af57b20f06dda35e62acb6275 (patch)
treee45b73872c40531c5c2fa9c3b07096e5827ac6ea /lib/io/src/xfrm
parent89cdef0859259fdea0165b0d3918777d1ed42955 (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')
-rw-r--r--lib/io/src/xfrm/istream.c8
-rw-r--r--lib/io/src/xfrm/ostream.c33
2 files changed, 21 insertions, 20 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);
diff --git a/lib/io/src/xfrm/ostream.c b/lib/io/src/xfrm/ostream.c
index 4c77f42..c035f2a 100644
--- a/lib/io/src/xfrm/ostream.c
+++ b/lib/io/src/xfrm/ostream.c
@@ -6,6 +6,7 @@
*/
#include "../internal.h"
#include "sqfs/io.h"
+#include "sqfs/error.h"
typedef struct ostream_xfrm_t {
sqfs_ostream_t base;
@@ -26,7 +27,7 @@ static int flush_inbuf(ostream_xfrm_t *xfrm, bool finish)
const int mode = finish ? XFRM_STREAM_FLUSH_FULL :
XFRM_STREAM_FLUSH_NONE;
sqfs_u32 off_in = 0, off_out = 0;
- int ret;
+ int ret, ioret;
while (finish || off_in < avail_in) {
ret = xfrm->xfrm->process_data(xfrm->xfrm,
@@ -36,15 +37,13 @@ static int flush_inbuf(ostream_xfrm_t *xfrm, bool finish)
avail_out - off_out,
&off_in, &off_out, mode);
- if (ret == XFRM_STREAM_ERROR) {
- fprintf(stderr,
- "%s: internal error in compressor.\n",
- xfrm->wrapped->get_filename(xfrm->wrapped));
- return -1;
- }
+ if (ret == XFRM_STREAM_ERROR)
+ return SQFS_ERROR_COMPRESSOR;
- if (xfrm->wrapped->append(xfrm->wrapped, xfrm->outbuf, off_out))
- return -1;
+ ioret = xfrm->wrapped->append(xfrm->wrapped,
+ xfrm->outbuf, off_out);
+ if (ioret)
+ return ioret;
off_out = 0;
@@ -53,8 +52,10 @@ static int flush_inbuf(ostream_xfrm_t *xfrm, bool finish)
}
if (off_out > 0) {
- if (xfrm->wrapped->append(xfrm->wrapped, xfrm->outbuf, off_out))
- return -1;
+ ret = xfrm->wrapped->append(xfrm->wrapped,
+ xfrm->outbuf, off_out);
+ if (ret)
+ return ret;
}
if (off_in < avail_in) {
@@ -74,8 +75,9 @@ static int xfrm_append(sqfs_ostream_t *strm, const void *data, size_t size)
while (size > 0) {
if (xfrm->inbuf_used >= BUFSZ) {
- if (flush_inbuf(xfrm, false))
- return -1;
+ int ret = flush_inbuf(xfrm, false);
+ if (ret)
+ return ret;
}
diff = BUFSZ - xfrm->inbuf_used;
@@ -102,8 +104,9 @@ static int xfrm_flush(sqfs_ostream_t *strm)
ostream_xfrm_t *xfrm = (ostream_xfrm_t *)strm;
if (xfrm->inbuf_used > 0) {
- if (flush_inbuf(xfrm, true))
- return -1;
+ int ret = flush_inbuf(xfrm, true);
+ if (ret)
+ return ret;
}
return xfrm->wrapped->flush(xfrm->wrapped);