aboutsummaryrefslogtreecommitdiff
path: root/lib/tar/src/record_to_memory.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/record_to_memory.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/record_to_memory.c')
-rw-r--r--lib/tar/src/record_to_memory.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/lib/tar/src/record_to_memory.c b/lib/tar/src/record_to_memory.c
index 597d6f8..84beaa3 100644
--- a/lib/tar/src/record_to_memory.c
+++ b/lib/tar/src/record_to_memory.c
@@ -19,8 +19,10 @@ char *record_to_memory(sqfs_istream_t *fp, size_t size)
goto fail_errno;
ret = sqfs_istream_read(fp, buffer, size);
- if (ret < 0)
+ if (ret < 0) {
+ sqfs_perror(fp->get_filename(fp), "reading tar record", ret);
goto fail;
+ }
if ((size_t)ret < size) {
fputs("Reading tar record: unexpected end-of-file.\n", stderr);
@@ -28,8 +30,12 @@ char *record_to_memory(sqfs_istream_t *fp, size_t size)
}
if (size % 512) {
- if (sqfs_istream_skip(fp, 512 - (size % 512)))
+ ret = sqfs_istream_skip(fp, 512 - (size % 512));
+ if (ret) {
+ sqfs_perror(fp->get_filename(fp),
+ "skipping tar padding", ret);
goto fail;
+ }
}
buffer[size] = '\0';