diff options
| author | David Oberhollenzer <david.oberhollenzer@sigma-star.at> | 2021-10-22 17:19:34 +0200 |
|---|---|---|
| committer | David Oberhollenzer <david.oberhollenzer@sigma-star.at> | 2022-03-30 22:31:30 +0200 |
| commit | 916c8f6e26140cf3c03e58726b57dc4f86e18316 (patch) | |
| tree | 59603136d62ef2b7ca3626e26929e848db7ab3f1 /tests/libtar/tar_target_filled.c | |
| parent | a0e9956f931e28eeb430bd2459668fd96a69c676 (diff) | |
Cleanup: remove struct stat from libtar
The idea was originally to use struct stat in the libfstree code, so
we can simply hose data read from a directory into the fstree_t. The
struct was then also used with libtar, for simpler interoperation,
but it turned out to introduce a lot of platform quirks and causes
more trouble than it's worth.
Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
Diffstat (limited to 'tests/libtar/tar_target_filled.c')
| -rw-r--r-- | tests/libtar/tar_target_filled.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/tests/libtar/tar_target_filled.c b/tests/libtar/tar_target_filled.c index f0f4026..57c6af9 100644 --- a/tests/libtar/tar_target_filled.c +++ b/tests/libtar/tar_target_filled.c @@ -22,33 +22,33 @@ int main(int argc, char **argv) /* "deep" directory hierarchy containg 2 files */ TEST_ASSERT(read_header(fp, &hdr) == 0); - TEST_EQUAL_UI(hdr.sb.st_mode, S_IFDIR | 0777); + TEST_EQUAL_UI(hdr.mode, S_IFDIR | 0777); TEST_STR_EQUAL(hdr.name, "20_characters_here01/"); clear_header(&hdr); TEST_ASSERT(read_header(fp, &hdr) == 0); - TEST_EQUAL_UI(hdr.sb.st_mode, S_IFDIR | 0777); + TEST_EQUAL_UI(hdr.mode, S_IFDIR | 0777); TEST_STR_EQUAL(hdr.name, "20_characters_here01/20_characters_here02/"); clear_header(&hdr); TEST_ASSERT(read_header(fp, &hdr) == 0); - TEST_EQUAL_UI(hdr.sb.st_mode, S_IFDIR | 0777); + TEST_EQUAL_UI(hdr.mode, S_IFDIR | 0777); TEST_STR_EQUAL(hdr.name, "20_characters_here01/20_characters_here02/" "20_characters_here03/"); clear_header(&hdr); TEST_ASSERT(read_header(fp, &hdr) == 0); - TEST_EQUAL_UI(hdr.sb.st_mode, S_IFDIR | 0777); + TEST_EQUAL_UI(hdr.mode, S_IFDIR | 0777); TEST_STR_EQUAL(hdr.name, "20_characters_here01/20_characters_here02/" "20_characters_here03/20_characters_here04/"); clear_header(&hdr); TEST_ASSERT(read_header(fp, &hdr) == 0); - TEST_EQUAL_UI(hdr.sb.st_mode, S_IFREG | 0777); + TEST_EQUAL_UI(hdr.mode, S_IFREG | 0777); TEST_STR_EQUAL(hdr.name, "20_characters_here01/20_characters_here02/" "20_characters_here03/20_characters_here04/" "errored_file_tst"); - TEST_EQUAL_UI(hdr.sb.st_size, 5); + TEST_EQUAL_UI(hdr.actual_size, 5); TEST_ASSERT(istream_read(fp, buffer, 5) == 5); buffer[5] = '\0'; TEST_STR_EQUAL(buffer, "test\n"); @@ -56,11 +56,11 @@ int main(int argc, char **argv) clear_header(&hdr); TEST_ASSERT(read_header(fp, &hdr) == 0); - TEST_EQUAL_UI(hdr.sb.st_mode, S_IFREG | 0777); + TEST_EQUAL_UI(hdr.mode, S_IFREG | 0777); TEST_STR_EQUAL(hdr.name, "20_characters_here01/20_characters_here02/" "20_characters_here03/20_characters_here04/" "some_test_file"); - TEST_EQUAL_UI(hdr.sb.st_size, 5); + TEST_EQUAL_UI(hdr.actual_size, 5); TEST_ASSERT(istream_read(fp, buffer, 5) == 5); buffer[5] = '\0'; TEST_STR_EQUAL(buffer, "test\n"); @@ -69,23 +69,23 @@ int main(int argc, char **argv) /* "deep" directory hierarchy containg a hard link */ TEST_ASSERT(read_header(fp, &hdr) == 0); - TEST_EQUAL_UI(hdr.sb.st_mode, S_IFDIR | 0777); + TEST_EQUAL_UI(hdr.mode, S_IFDIR | 0777); TEST_STR_EQUAL(hdr.name, "20CharsForLnkTest001/"); clear_header(&hdr); TEST_ASSERT(read_header(fp, &hdr) == 0); - TEST_EQUAL_UI(hdr.sb.st_mode, S_IFDIR | 0777); + TEST_EQUAL_UI(hdr.mode, S_IFDIR | 0777); TEST_STR_EQUAL(hdr.name, "20CharsForLnkTest001/20CharsForLnkTest002/"); clear_header(&hdr); TEST_ASSERT(read_header(fp, &hdr) == 0); - TEST_EQUAL_UI(hdr.sb.st_mode, S_IFDIR | 0777); + TEST_EQUAL_UI(hdr.mode, S_IFDIR | 0777); TEST_STR_EQUAL(hdr.name, "20CharsForLnkTest001/20CharsForLnkTest002/" "20CharsForLnkTest003/"); clear_header(&hdr); TEST_ASSERT(read_header(fp, &hdr) == 0); - TEST_EQUAL_UI(hdr.sb.st_mode, S_IFDIR | 0777); + TEST_EQUAL_UI(hdr.mode, S_IFDIR | 0777); TEST_STR_EQUAL(hdr.name, "20CharsForLnkTest001/20CharsForLnkTest002/" "20CharsForLnkTest003/20CharsForLnkTest004/"); clear_header(&hdr); |