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>

12 files changed, 41 insertions, 14 deletions

diff --git a/lib/tar/test/tar_big_file.c b/lib/tar/test/tar_big_file.c
index 444548b..6a88d4c 100644
--- a/lib/tar/test/tar_big_file.c
+++ b/lib/tar/test/tar_big_file.c
@@ -13,9 +13,11 @@ int main(int argc, char **argv)
 {
 	tar_header_decoded_t hdr;
 	sqfs_istream_t *fp;
+	int ret;
 	(void)argc; (void)argv;
 
-	fp = istream_open_file(STRVALUE(TESTPATH) "/" STRVALUE(TESTFILE));
+	ret = istream_open_file(&fp, STRVALUE(TESTPATH) "/" STRVALUE(TESTFILE));
+	TEST_EQUAL_I(ret, 0);
 	TEST_NOT_NULL(fp);
 	TEST_ASSERT(read_header(fp, &hdr) == 0);
 	TEST_EQUAL_UI(hdr.mode, S_IFREG | 0644);
diff --git a/lib/tar/test/tar_fuzz.c b/lib/tar/test/tar_fuzz.c
index 92c0952..42fe73d 100644
--- a/lib/tar/test/tar_fuzz.c
+++ b/lib/tar/test/tar_fuzz.c
@@ -8,6 +8,7 @@
 
 #include "io/file.h"
 #include "tar/tar.h"
+#include "common.h"
 
 #include <stdlib.h>
 #include <stdio.h>
@@ -23,9 +24,11 @@ int main(int argc, char **argv)
 		return EXIT_FAILURE;
 	}
 
-	fp = istream_open_file(argv[1]);
-	if (fp == NULL)
+	ret = istream_open_file(&fp, argv[1]);
+	if (ret) {
+		sqfs_perror("stdint", NULL, ret);
 		return EXIT_FAILURE;
+	}
 
 	for (;;) {
 		ret = read_header(fp, &hdr);
diff --git a/lib/tar/test/tar_iterator.c b/lib/tar/test/tar_iterator.c
index f51ecd6..8de50ed 100644
--- a/lib/tar/test/tar_iterator.c
+++ b/lib/tar/test/tar_iterator.c
@@ -36,10 +36,13 @@ int main(int argc, char **argv)
 	char buffer[100];
 	sqfs_s32 ret;
 	sqfs_s64 ts;
+	int iret;
 	(void)argc; (void)argv;
 
 	/* Open the file, create an iterator */
-	fp = istream_open_file(STRVALUE(TESTPATH) "/" STRVALUE(TESTFILE));
+	iret = istream_open_file(&fp,
+				 STRVALUE(TESTPATH) "/" STRVALUE(TESTFILE));
+	TEST_EQUAL_I(iret, 0);
 	TEST_NOT_NULL(fp);
 	TEST_EQUAL_UI(((sqfs_object_t *)fp)->refcount, 1);
 	it = tar_open_stream(fp);
@@ -106,7 +109,9 @@ int main(int argc, char **argv)
 	sqfs_drop(fp);
 
 	/* re-open the tar iterator */
-	fp = istream_open_file(STRVALUE(TESTPATH) "/" STRVALUE(TESTFILE));
+	iret = istream_open_file(&fp,
+				 STRVALUE(TESTPATH) "/" STRVALUE(TESTFILE));
+	TEST_EQUAL_I(iret, 0);
 	TEST_NOT_NULL(fp);
 	it = tar_open_stream(fp);
 	TEST_NOT_NULL(it);
diff --git a/lib/tar/test/tar_iterator2.c b/lib/tar/test/tar_iterator2.c
index 7483e81..8826762 100644
--- a/lib/tar/test/tar_iterator2.c
+++ b/lib/tar/test/tar_iterator2.c
@@ -49,9 +49,12 @@ int main(int argc, char **argv)
 	dir_entry_t *ent;
 	uint64_t offset;
 	sqfs_s32 i, ret;
+	int iret;
 	(void)argc; (void)argv;
 
-	fp = istream_open_file(STRVALUE(TESTPATH) "/" STRVALUE(TESTFILE));
+	iret = istream_open_file(&fp,
+				 STRVALUE(TESTPATH) "/" STRVALUE(TESTFILE));
+	TEST_EQUAL_I(iret, 0);
 	TEST_NOT_NULL(fp);
 	it = tar_open_stream(fp);
 	TEST_NOT_NULL(it);
diff --git a/lib/tar/test/tar_iterator3.c b/lib/tar/test/tar_iterator3.c
index 11c2fd2..0aee0e3 100644
--- a/lib/tar/test/tar_iterator3.c
+++ b/lib/tar/test/tar_iterator3.c
@@ -23,7 +23,8 @@ int main(int argc, char **argv)
 
 	TEST_ASSERT(chdir(TEST_PATH) == 0);
 
-	fp = istream_open_file("format-acceptance/link_filled.tar");
+	ret = istream_open_file(&fp, "format-acceptance/link_filled.tar");
+	TEST_EQUAL_I(ret, 0);
 	TEST_NOT_NULL(fp);
 	TEST_EQUAL_UI(((sqfs_object_t *)fp)->refcount, 1);
 	it = tar_open_stream(fp);
diff --git a/lib/tar/test/tar_simple.c b/lib/tar/test/tar_simple.c
index a666eb5..8ee5b84 100644
--- a/lib/tar/test/tar_simple.c
+++ b/lib/tar/test/tar_simple.c
@@ -40,9 +40,11 @@ int main(int argc, char **argv)
 	sqfs_istream_t *fp;
 	char buffer[6];
 	sqfs_s64 ts;
+	int ret;
 	(void)argc; (void)argv;
 
-	fp = istream_open_file(STRVALUE(TESTPATH) "/" STRVALUE(TESTFILE));
+	ret = istream_open_file(&fp, STRVALUE(TESTPATH) "/" STRVALUE(TESTFILE));
+	TEST_EQUAL_I(ret, 0);
 	TEST_NOT_NULL(fp);
 	TEST_ASSERT(read_header(fp, &hdr) == 0);
 	TEST_EQUAL_UI(hdr.mode, S_IFREG | 0644);
diff --git a/lib/tar/test/tar_sparse.c b/lib/tar/test/tar_sparse.c
index 99d4639..d93482d 100644
--- a/lib/tar/test/tar_sparse.c
+++ b/lib/tar/test/tar_sparse.c
@@ -14,8 +14,10 @@ static void test_case_sparse(const char *path)
 	tar_header_decoded_t hdr;
 	sparse_map_t *sparse;
 	sqfs_istream_t *fp;
+	int ret;
 
-	fp = istream_open_file(path);
+	ret = istream_open_file(&fp, path);
+	TEST_EQUAL_I(ret, 0);
 	TEST_NOT_NULL(fp);
 	TEST_ASSERT(read_header(fp, &hdr) == 0);
 	TEST_EQUAL_UI(hdr.mode, S_IFREG | 0644);
diff --git a/lib/tar/test/tar_sparse_gnu.c b/lib/tar/test/tar_sparse_gnu.c
index 675ef9a..6effb52 100644
--- a/lib/tar/test/tar_sparse_gnu.c
+++ b/lib/tar/test/tar_sparse_gnu.c
@@ -14,11 +14,13 @@ int main(int argc, char **argv)
 	tar_header_decoded_t hdr;
 	sparse_map_t *sparse;
 	sqfs_istream_t *fp;
+	int ret;
 	(void)argc; (void)argv;
 
 	TEST_ASSERT(chdir(TEST_PATH) == 0);
 
-	fp = istream_open_file("sparse-files/gnu-small.tar");
+	ret = istream_open_file(&fp, "sparse-files/gnu-small.tar");
+	TEST_EQUAL_I(ret, 0);
 	TEST_NOT_NULL(fp);
 	TEST_ASSERT(read_header(fp, &hdr) == 0);
 	TEST_EQUAL_UI(hdr.mode, S_IFREG | 0644);
diff --git a/lib/tar/test/tar_target_filled.c b/lib/tar/test/tar_target_filled.c
index 4f061c0..85a1af4 100644
--- a/lib/tar/test/tar_target_filled.c
+++ b/lib/tar/test/tar_target_filled.c
@@ -14,11 +14,13 @@ int main(int argc, char **argv)
 	tar_header_decoded_t hdr;
 	sqfs_istream_t *fp;
 	char buffer[16];
+	int ret;
 	(void)argc; (void)argv;
 
 	TEST_ASSERT(chdir(TEST_PATH) == 0);
 
-	fp = istream_open_file("format-acceptance/link_filled.tar");
+	ret = istream_open_file(&fp, "format-acceptance/link_filled.tar");
+	TEST_EQUAL_I(ret, 0);
 	TEST_NOT_NULL(fp);
 
 	/* "deep" directory hierarchy containg 2 files */
diff --git a/lib/tar/test/tar_write_simple.c b/lib/tar/test/tar_write_simple.c
index ca8d1e5..28f199f 100644
--- a/lib/tar/test/tar_write_simple.c
+++ b/lib/tar/test/tar_write_simple.c
@@ -188,7 +188,8 @@ int main(int argc, char **argv)
 	TEST_EQUAL_UI(wr_offset, sizeof(wr_buffer));
 	TEST_EQUAL_UI(sizeof(rd_buffer), sizeof(wr_buffer));
 
-	fp = istream_open_file(STRVALUE(TESTPATH) "/" STRVALUE(TESTFILE));
+	ret = istream_open_file(&fp, STRVALUE(TESTPATH) "/" STRVALUE(TESTFILE));
+	TEST_EQUAL_I(ret, 0);
 	TEST_NOT_NULL(fp);
 
 	ret = sqfs_istream_read(fp, rd_buffer, sizeof(rd_buffer));
diff --git a/lib/tar/test/tar_xattr.c b/lib/tar/test/tar_xattr.c
index 26a2cd0..0e0579c 100644
--- a/lib/tar/test/tar_xattr.c
+++ b/lib/tar/test/tar_xattr.c
@@ -15,9 +15,11 @@ int main(int argc, char **argv)
 	tar_header_decoded_t hdr;
 	sqfs_istream_t *fp;
 	char buffer[6];
+	int ret;
 	(void)argc; (void)argv;
 
-	fp = istream_open_file(STRVALUE(TESTPATH) "/" STRVALUE(TESTFILE));
+	ret = istream_open_file(&fp, STRVALUE(TESTPATH) "/" STRVALUE(TESTFILE));
+	TEST_EQUAL_I(ret, 0);
 	TEST_NOT_NULL(fp);
 	TEST_ASSERT(read_header(fp, &hdr) == 0);
 	TEST_EQUAL_UI(hdr.mode, S_IFREG | 0644);
diff --git a/lib/tar/test/tar_xattr_bin.c b/lib/tar/test/tar_xattr_bin.c
index 94c8d76..617c356 100644
--- a/lib/tar/test/tar_xattr_bin.c
+++ b/lib/tar/test/tar_xattr_bin.c
@@ -23,9 +23,11 @@ int main(int argc, char **argv)
 	tar_header_decoded_t hdr;
 	sqfs_istream_t *fp;
 	char buffer[6];
+	int ret;
 	(void)argc; (void)argv;
 
-	fp = istream_open_file(STRVALUE(TESTPATH) "/" STRVALUE(TESTFILE));
+	ret = istream_open_file(&fp, STRVALUE(TESTPATH) "/" STRVALUE(TESTFILE));
+	TEST_EQUAL_I(ret, 0);
 	TEST_NOT_NULL(fp);
 	TEST_ASSERT(read_header(fp, &hdr) == 0);
 	TEST_EQUAL_UI(hdr.mode, S_IFREG | 0644);