aboutsummaryrefslogtreecommitdiff
path: root/lib/tar/src/read_sparse_map_new.c
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/tar/src/read_sparse_map_new.c
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/tar/src/read_sparse_map_new.c')
-rw-r--r--lib/tar/src/read_sparse_map_new.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/lib/tar/src/read_sparse_map_new.c b/lib/tar/src/read_sparse_map_new.c
index 4e317a8..e42466c 100644
--- a/lib/tar/src/read_sparse_map_new.c
+++ b/lib/tar/src/read_sparse_map_new.c
@@ -42,8 +42,10 @@ sparse_map_t *read_gnu_new_sparse(sqfs_istream_t *fp, tar_header_decoded_t *out)
goto fail_format;
ret = sqfs_istream_read(fp, buffer, 512);
- if (ret < 0)
+ if (ret < 0) {
+ sqfs_perror(fp->get_filename(fp), "reading sparse list", ret);
goto fail;
+ }
if (ret < 512)
goto fail_format;
@@ -69,8 +71,11 @@ sparse_map_t *read_gnu_new_sparse(sqfs_istream_t *fp, tar_header_decoded_t *out)
goto fail_format;
ret = sqfs_istream_read(fp, buffer + 512, 512);
- if (ret < 0)
+ if (ret < 0) {
+ sqfs_perror(fp->get_filename(fp),
+ "reading sparse list", ret);
goto fail;
+ }
if (ret < 512)
goto fail_format;