From e7ecb1f92ae618a56ee8eabb6cbf98365de3695a Mon Sep 17 00:00:00 2001 From: David Oberhollenzer Date: Sun, 2 Jul 2023 19:50:05 +0200 Subject: Move sqfs_dir_entry_t code from libio into libsquashfs Signed-off-by: David Oberhollenzer --- lib/tar/src/iterator.c | 5 ++--- lib/tar/test/tar_iterator3.c | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) (limited to 'lib/tar') diff --git a/lib/tar/src/iterator.c b/lib/tar/src/iterator.c index b11be77..6b456d6 100644 --- a/lib/tar/src/iterator.c +++ b/lib/tar/src/iterator.c @@ -209,7 +209,7 @@ retry: return tar->state; } - *out = dir_entry_create(tar->current.name); + *out = sqfs_dir_entry_create(tar->current.name, tar->current.mode, 0); if ((*out) == NULL) { tar->state = SQFS_ERROR_ALLOC; return tar->state; @@ -219,11 +219,10 @@ retry: (*out)->rdev = tar->current.devno; (*out)->uid = tar->current.uid; (*out)->gid = tar->current.gid; - (*out)->mode = tar->current.mode; if (tar->current.is_hard_link) { (*out)->mode = (S_IFLNK | 0777); - (*out)->flags |= DIR_ENTRY_FLAG_HARD_LINK; + (*out)->flags |= SQFS_DIR_ENTRY_FLAG_HARD_LINK; } if (S_ISREG((*out)->mode)) diff --git a/lib/tar/test/tar_iterator3.c b/lib/tar/test/tar_iterator3.c index 36a9060..f8d0bda 100644 --- a/lib/tar/test/tar_iterator3.c +++ b/lib/tar/test/tar_iterator3.c @@ -151,7 +151,7 @@ int main(int argc, char **argv) "20CharsForLnkTest003/20CharsForLnkTest004/" "01234567890123456789"); TEST_EQUAL_UI(ent->mode, S_IFLNK | 0777); - TEST_ASSERT((ent->flags & DIR_ENTRY_FLAG_HARD_LINK) != 0); + TEST_ASSERT((ent->flags & SQFS_DIR_ENTRY_FLAG_HARD_LINK) != 0); free(ent); ret = it->read_link(it, &link); -- cgit v1.2.3