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/tar/src/read_header.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/tar/src/read_header.c')
| -rw-r--r-- | lib/tar/src/read_header.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/lib/tar/src/read_header.c b/lib/tar/src/read_header.c index 16fc9d7..df2f56c 100644 --- a/lib/tar/src/read_header.c +++ b/lib/tar/src/read_header.c @@ -176,8 +176,11 @@ int read_header(sqfs_istream_t *fp, tar_header_decoded_t *out) for (;;) { ret = sqfs_istream_read(fp, &hdr, sizeof(hdr)); - if (ret < 0) + if (ret < 0) { + sqfs_perror(fp->get_filename(fp), + "reading raw tar header", ret); goto fail; + } if ((size_t)ret < sizeof(hdr)) goto out_eof; @@ -226,7 +229,12 @@ int read_header(sqfs_istream_t *fp, tar_header_decoded_t *out) goto fail; if (pax_size % 512) pax_size += 512 - (pax_size % 512); - sqfs_istream_skip(fp, pax_size); + ret = sqfs_istream_skip(fp, pax_size); + if (ret) { + sqfs_perror(fp->get_filename(fp), + "skipping padding", ret); + goto fail; + } continue; case TAR_TYPE_PAX: clear_header(out); |