aboutsummaryrefslogtreecommitdiff
path: root/bin/sqfs2tar/src/sqfs2tar.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 /bin/sqfs2tar/src/sqfs2tar.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 'bin/sqfs2tar/src/sqfs2tar.c')
-rw-r--r--bin/sqfs2tar/src/sqfs2tar.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/bin/sqfs2tar/src/sqfs2tar.c b/bin/sqfs2tar/src/sqfs2tar.c
index e90aa56..714f6db 100644
--- a/bin/sqfs2tar/src/sqfs2tar.c
+++ b/bin/sqfs2tar/src/sqfs2tar.c
@@ -117,9 +117,9 @@ int main(int argc, char **argv)
process_args(argc, argv);
- out_file = ostream_open_stdout();
- if (out_file == NULL) {
- perror("changing stdout to binary mode");
+ ret = ostream_open_stdout(&out_file);
+ if (ret) {
+ sqfs_perror("stdout", "creating stream wrapper", ret);
goto out;
}
@@ -253,8 +253,11 @@ int main(int argc, char **argv)
if (terminate_archive())
goto out;
- if (out_file->flush(out_file))
+ ret = out_file->flush(out_file);
+ if (ret) {
+ sqfs_perror(out_file->get_filename(out_file), NULL, ret);
goto out;
+ }
status = EXIT_SUCCESS;
out: