diff options
| author | David Oberhollenzer <david.oberhollenzer@sigma-star.at> | 2020-09-13 13:37:42 +0200 |
|---|---|---|
| committer | David Oberhollenzer <david.oberhollenzer@sigma-star.at> | 2020-09-16 09:34:35 +0200 |
| commit | f757737060d4daebb24a32e90d912661428708a8 (patch) | |
| tree | a6e96145d4fc540e435c13a69c924329db2edb6d /tests/tar_xattr.c | |
| parent | c1a2cb729bd5bb5fdadf00cb3968bbc541f79750 (diff) | |
Remodel libtar/tar2sqfs to read data from an istream_t
Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
Diffstat (limited to 'tests/tar_xattr.c')
| -rw-r--r-- | tests/tar_xattr.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/tests/tar_xattr.c b/tests/tar_xattr.c index 179af2e..e06b428 100644 --- a/tests/tar_xattr.c +++ b/tests/tar_xattr.c @@ -10,9 +10,10 @@ int main(void) { tar_header_decoded_t hdr; char buffer[6]; - FILE *fp; + istream_t *fp; - fp = test_open_read(STRVALUE(TESTPATH) "/" STRVALUE(TESTFILE)); + fp = istream_open_file(STRVALUE(TESTPATH) "/" STRVALUE(TESTFILE)); + TEST_NOT_NULL(fp); TEST_ASSERT(read_header(fp, &hdr) == 0); TEST_EQUAL_UI(hdr.sb.st_mode, S_IFREG | 0644); TEST_EQUAL_UI(hdr.sb.st_uid, 01750); @@ -22,7 +23,7 @@ int main(void) TEST_EQUAL_UI(hdr.mtime, 1543094477); TEST_STR_EQUAL(hdr.name, "input.txt"); TEST_ASSERT(!hdr.unknown_record); - TEST_ASSERT(read_retry("reading tar data", fp, buffer, 5) == 0); + TEST_ASSERT(istream_read(fp, buffer, 5) == 5); buffer[5] = '\0'; TEST_STR_EQUAL(buffer, "test\n"); @@ -33,6 +34,6 @@ int main(void) TEST_NULL(hdr.xattr->next); clear_header(&hdr); - fclose(fp); + sqfs_destroy(fp); return EXIT_SUCCESS; } |