diff options
Diffstat (limited to 'lib/common')
| -rw-r--r-- | lib/common/Makemodule.am | 21 | ||||
| -rw-r--r-- | lib/common/src/dir_tree_iterator.c | 257 | ||||
| -rw-r--r-- | lib/common/test/dir_tree_iterator.c | 254 | ||||
| -rw-r--r-- | lib/common/test/dir_tree_iterator2.c | 225 | ||||
| -rw-r--r-- | lib/common/test/dir_tree_iterator3.c | 108 |
5 files changed, 863 insertions, 2 deletions
diff --git a/lib/common/Makemodule.am b/lib/common/Makemodule.am index 9438d3a..5230fcf 100644 --- a/lib/common/Makemodule.am +++ b/lib/common/Makemodule.am @@ -7,7 +7,8 @@ libcommon_a_SOURCES = include/common.h include/simple_writer.h \ lib/common/src/writer/serialize_fstree.c lib/common/src/writer/finish.c\ lib/common/src/fstree_cli.c lib/common/src/perror.c \ lib/common/src/dir_tree.c lib/common/src/read_tree.c \ - lib/common/src/stream.c + lib/common/src/stream.c lib/common/src/dir_tree_iterator.c \ + include/dir_tree_iterator.h lib/common/src/dir_tree_iterator.c libcommon_a_CFLAGS = $(AM_CFLAGS) $(LZO_CFLAGS) if WITH_LZO @@ -26,8 +27,24 @@ test_fstree_cli_LDADD = libcommon.a libutil.a libcompat.a test_get_node_path_SOURCES = lib/common/test/get_node_path.c test_get_node_path_LDADD = libcommon.a libsquashfs.la libcompat.a +test_dir_tree_iterator_SOURCES = lib/common/test/dir_tree_iterator.c +test_dir_tree_iterator_LDADD = libcommon.a libsquashfs.la libutil.a libcompat.a +test_dir_tree_iterator_CPPFLAGS = $(AM_CPPFLAGS) +test_dir_tree_iterator_CPPFLAGS += -DTESTPATH=$(top_srcdir)/lib/sqfs/test/testdir + +test_dir_tree_iterator2_SOURCES = lib/common/test/dir_tree_iterator2.c +test_dir_tree_iterator2_LDADD = libcommon.a libsquashfs.la libutil.a libcompat.a +test_dir_tree_iterator2_CPPFLAGS = $(AM_CPPFLAGS) +test_dir_tree_iterator2_CPPFLAGS += -DTESTPATH=$(top_srcdir)/lib/sqfs/test/testdir + +test_dir_tree_iterator3_SOURCES = lib/common/test/dir_tree_iterator3.c +test_dir_tree_iterator3_LDADD = libcommon.a libsquashfs.la libutil.a libcompat.a +test_dir_tree_iterator3_CPPFLAGS = $(AM_CPPFLAGS) +test_dir_tree_iterator3_CPPFLAGS += -DTESTPATH=$(top_srcdir)/lib/sqfs/test/testdir + LIBCOMMON_TESTS = \ - test_istream_mem test_fstree_cli test_get_node_path + test_istream_mem test_fstree_cli test_get_node_path \ + test_dir_tree_iterator test_dir_tree_iterator2 test_dir_tree_iterator3 check_PROGRAMS += $(LIBCOMMON_TESTS) TESTS += $(LIBCOMMON_TESTS) diff --git a/lib/common/src/dir_tree_iterator.c b/lib/common/src/dir_tree_iterator.c new file mode 100644 index 0000000..f161507 --- /dev/null +++ b/lib/common/src/dir_tree_iterator.c @@ -0,0 +1,257 @@ +/* SPDX-License-Identifier: LGPL-3.0-or-later */ +/* + * dir_tree_iterator.c + * + * Copyright (C) 2023 David Oberhollenzer <goliath@infraroot.at> + */ +#include "config.h" +#include "dir_tree_iterator.h" +#include "util/util.h" +#include "sqfs/error.h" +#include "sqfs/io.h" + +#include <stdlib.h> +#include <string.h> + +typedef struct { + sqfs_dir_iterator_t base; + + dir_tree_cfg_t cfg; + int state; + sqfs_dir_iterator_t *rec; +} dir_tree_iterator_t; + +static bool should_skip(const dir_tree_iterator_t *dir, const sqfs_dir_entry_t *ent) +{ + unsigned int type_mask; + + if ((dir->cfg.flags & DIR_SCAN_ONE_FILESYSTEM)) { + if (ent->flags & SQFS_DIR_ENTRY_FLAG_MOUNT_POINT) + return true; + } + + switch (ent->mode & S_IFMT) { + case S_IFSOCK: type_mask = DIR_SCAN_NO_SOCK; break; + case S_IFLNK: type_mask = DIR_SCAN_NO_SLINK; break; + case S_IFREG: type_mask = DIR_SCAN_NO_FILE; break; + case S_IFBLK: type_mask = DIR_SCAN_NO_BLK; break; + case S_IFCHR: type_mask = DIR_SCAN_NO_CHR; break; + case S_IFIFO: type_mask = DIR_SCAN_NO_FIFO; break; + default: type_mask = 0; break; + } + + return (dir->cfg.flags & type_mask) != 0; +} + +static sqfs_dir_entry_t *expand_path(const dir_tree_iterator_t *it, sqfs_dir_entry_t *ent) +{ + if (it->cfg.prefix != NULL && it->cfg.prefix[0] != '\0') { + size_t plen = strlen(it->cfg.prefix) + 1; + size_t slen = strlen(ent->name) + 1; + void *new = realloc(ent, sizeof(*ent) + plen + slen); + + if (new == NULL) { + free(ent); + return NULL; + } + + ent = new; + memmove(ent->name + plen, ent->name, slen); + + memcpy(ent->name, it->cfg.prefix, plen - 1); + ent->name[plen - 1] = '/'; + } + + return ent; +} + +static void apply_changes(const dir_tree_iterator_t *it, sqfs_dir_entry_t *ent) +{ + if (!(it->cfg.flags & DIR_SCAN_KEEP_TIME)) + ent->mtime = it->cfg.def_mtime; + + if (!(it->cfg.flags & DIR_SCAN_KEEP_UID)) + ent->uid = it->cfg.def_uid; + + if (!(it->cfg.flags & DIR_SCAN_KEEP_GID)) + ent->gid = it->cfg.def_gid; + + if (!(it->cfg.flags & DIR_SCAN_KEEP_MODE)) { + ent->mode &= ~(07777); + ent->mode |= it->cfg.def_mode & 07777; + } +} + +/*****************************************************************************/ + +static void destroy(sqfs_object_t *obj) +{ + dir_tree_iterator_t *it = (dir_tree_iterator_t *)obj; + + sqfs_drop(it->rec); + free(it); +} + +static int next(sqfs_dir_iterator_t *base, sqfs_dir_entry_t **out) +{ + dir_tree_iterator_t *it = (dir_tree_iterator_t *)base; + sqfs_dir_entry_t *ent; + int ret; + + if (it->state) + return it->state; +retry: + *out = NULL; + ent = NULL; + + for (;;) { + ret = it->rec->next(it->rec, &ent); + if (ret != 0) { + it->state = ret; + return ret; + } + + if (!should_skip(it, ent)) + break; + + if (S_ISDIR(ent->mode)) + it->rec->ignore_subdir(it->rec); + free(ent); + ent = NULL; + } + + ent = expand_path(it, ent); + if (ent == NULL) { + it->state = SQFS_ERROR_ALLOC; + return it->state; + } + + apply_changes(it, ent); + + if (S_ISDIR(ent->mode)) { + if (it->cfg.flags & DIR_SCAN_NO_RECURSION) + it->rec->ignore_subdir(it->rec); + + if (it->cfg.flags & DIR_SCAN_NO_DIR) { + free(ent); + goto retry; + } + } + + if (it->cfg.name_pattern != NULL) { + if (it->cfg.flags & DIR_SCAN_MATCH_FULL_PATH) { + ret = fnmatch(it->cfg.name_pattern, + ent->name, FNM_PATHNAME); + } else { + const char *name = strrchr(ent->name, '/'); + name = (name == NULL) ? ent->name : (name + 1); + + ret = fnmatch(it->cfg.name_pattern, name, 0); + } + + if (ret != 0) { + free(ent); + goto retry; + } + } + + *out = ent; + return it->state; +} + +static int read_link(sqfs_dir_iterator_t *base, char **out) +{ + dir_tree_iterator_t *it = (dir_tree_iterator_t *)base; + + if (it->state) + return it->state; + + return it->rec->read_link(it->rec, out); +} + +static int open_subdir(sqfs_dir_iterator_t *base, sqfs_dir_iterator_t **out) +{ + dir_tree_iterator_t *it = (dir_tree_iterator_t *)base; + + if (it->state) + return it->state; + + return it->rec->open_subdir(it->rec, out); +} + +static void ignore_subdir(sqfs_dir_iterator_t *base) +{ + dir_tree_iterator_t *it = (dir_tree_iterator_t *)base; + + if (it->state == 0) + it->rec->ignore_subdir(it->rec); +} + +static int open_file_ro(sqfs_dir_iterator_t *base, sqfs_istream_t **out) +{ + dir_tree_iterator_t *it = (dir_tree_iterator_t *)base; + + if (it->state) + return it->state; + + return it->rec->open_file_ro(it->rec, out); +} + +static int read_xattr(sqfs_dir_iterator_t *base, sqfs_xattr_t **out) +{ + dir_tree_iterator_t *it = (dir_tree_iterator_t *)base; + + if (it->state) + return it->state; + + return it->rec->read_xattr(it->rec, out); +} + +sqfs_dir_iterator_t *dir_tree_iterator_create(const char *path, + const dir_tree_cfg_t *cfg) +{ + dir_tree_iterator_t *it = calloc(1, sizeof(*it)); + sqfs_dir_iterator_t *dir; + int ret; + + if (it == NULL) { + perror(path); + return NULL; + } + + it->cfg = *cfg; + + ret = sqfs_dir_iterator_create_native(&dir, path, 0); + if (ret) { + perror(path); + goto fail; + } + + ret = sqfs_dir_iterator_create_recursive(&it->rec, dir); + sqfs_drop(dir); + if (ret) + goto fail_oom; + + if (!(cfg->flags & DIR_SCAN_NO_HARDLINKS)) { + ret = sqfs_hard_link_filter_create(&dir, it->rec); + sqfs_drop(it->rec); + it->rec = dir; + if (ret) + goto fail_oom; + } + + sqfs_object_init(it, destroy, NULL); + ((sqfs_dir_iterator_t *)it)->next = next; + ((sqfs_dir_iterator_t *)it)->read_link = read_link; + ((sqfs_dir_iterator_t *)it)->open_subdir = open_subdir; + ((sqfs_dir_iterator_t *)it)->ignore_subdir = ignore_subdir; + ((sqfs_dir_iterator_t *)it)->open_file_ro = open_file_ro; + ((sqfs_dir_iterator_t *)it)->read_xattr = read_xattr; + + return (sqfs_dir_iterator_t *)it; +fail_oom: + fprintf(stderr, "%s: out of memory\n", path); +fail: + free(it); + return NULL; +} diff --git a/lib/common/test/dir_tree_iterator.c b/lib/common/test/dir_tree_iterator.c new file mode 100644 index 0000000..2a065d8 --- /dev/null +++ b/lib/common/test/dir_tree_iterator.c @@ -0,0 +1,254 @@ +/* SPDX-License-Identifier: GPL-3.0-or-later */ +/* + * dir_tree_iterator.c + * + * Copyright (C) 2019 David Oberhollenzer <goliath@infraroot.at> + */ +#include "config.h" + +#include "dir_tree_iterator.h" +#include "sqfs/error.h" +#include "util/test.h" +#include "sqfs/io.h" +#include "compat.h" +#include "common.h" + +static int compare_entries(const void *a, const void *b) +{ + const sqfs_dir_entry_t *const *lhs = a; + const sqfs_dir_entry_t *const *rhs = b; + + return strcmp((*lhs)->name, (*rhs)->name); +} + +int main(int argc, char **argv) +{ + sqfs_dir_entry_t *ent[17]; + sqfs_dir_iterator_t *dir; + dir_tree_cfg_t cfg; + size_t i; + int ret; + (void)argc; (void)argv; + + memset(&cfg, 0, sizeof(cfg)); + cfg.def_mtime = 1337; + cfg.def_uid = 42; + cfg.def_gid = 23; + cfg.flags = DIR_SCAN_NO_HARDLINKS; + + dir = dir_tree_iterator_create(TEST_PATH, &cfg); + TEST_NOT_NULL(dir); + + for (i = 0; i < 16; ++i) { + ret = dir->next(dir, &ent[i]); + TEST_NOT_NULL(ent[i]); + TEST_EQUAL_I(ret, 0); + printf("READ %s\n", ent[i]->name); + } + + ret = dir->next(dir, &ent[16]); + TEST_NULL(ent[16]); + TEST_ASSERT(ret > 0); + + dir = sqfs_drop(dir); + + qsort(ent, 16, sizeof(ent[0]), compare_entries); + + printf("After sort:\n"); + for (i = 0; i < 16; ++i) + printf("%s\n", ent[i]->name); + + TEST_STR_EQUAL(ent[0]->name, "dira"); + TEST_ASSERT(S_ISDIR(ent[0]->mode)); + TEST_EQUAL_UI(ent[0]->mtime, 1337); + TEST_EQUAL_UI(ent[0]->uid, 42); + TEST_EQUAL_UI(ent[0]->gid, 23); + TEST_STR_EQUAL(ent[1]->name, "dira/file_a0"); + TEST_ASSERT(S_ISREG(ent[1]->mode)); + TEST_EQUAL_UI(ent[1]->mtime, 1337); + TEST_EQUAL_UI(ent[1]->uid, 42); + TEST_EQUAL_UI(ent[1]->gid, 23); + TEST_STR_EQUAL(ent[2]->name, "dira/file_a1"); + TEST_ASSERT(S_ISREG(ent[2]->mode)); + TEST_EQUAL_UI(ent[2]->mtime, 1337); + TEST_EQUAL_UI(ent[2]->uid, 42); + TEST_EQUAL_UI(ent[2]->gid, 23); + TEST_STR_EQUAL(ent[3]->name, "dira/file_a2"); + TEST_ASSERT(S_ISREG(ent[3]->mode)); + TEST_EQUAL_UI(ent[3]->mtime, 1337); + TEST_EQUAL_UI(ent[3]->uid, 42); + TEST_EQUAL_UI(ent[3]->gid, 23); + TEST_STR_EQUAL(ent[4]->name, "dirb"); + TEST_ASSERT(S_ISDIR(ent[4]->mode)); + TEST_EQUAL_UI(ent[4]->mtime, 1337); + TEST_EQUAL_UI(ent[4]->uid, 42); + TEST_EQUAL_UI(ent[4]->gid, 23); + TEST_STR_EQUAL(ent[5]->name, "dirb/dirx"); + TEST_ASSERT(S_ISDIR(ent[5]->mode)); + TEST_EQUAL_UI(ent[5]->mtime, 1337); + TEST_EQUAL_UI(ent[5]->uid, 42); + TEST_EQUAL_UI(ent[5]->gid, 23); + TEST_STR_EQUAL(ent[6]->name, "dirb/dirx/file_x0"); + TEST_ASSERT(S_ISREG(ent[6]->mode)); + TEST_EQUAL_UI(ent[6]->mtime, 1337); + TEST_EQUAL_UI(ent[6]->uid, 42); + TEST_EQUAL_UI(ent[6]->gid, 23); + TEST_STR_EQUAL(ent[7]->name, "dirb/dirx/file_x1"); + TEST_ASSERT(S_ISREG(ent[7]->mode)); + TEST_EQUAL_UI(ent[7]->mtime, 1337); + TEST_EQUAL_UI(ent[7]->uid, 42); + TEST_EQUAL_UI(ent[7]->gid, 23); + TEST_STR_EQUAL(ent[8]->name, "dirb/dirx/file_x2"); + TEST_ASSERT(S_ISREG(ent[8]->mode)); + TEST_EQUAL_UI(ent[8]->mtime, 1337); + TEST_EQUAL_UI(ent[8]->uid, 42); + TEST_EQUAL_UI(ent[8]->gid, 23); + TEST_STR_EQUAL(ent[9]->name, "dirb/file_b0"); + TEST_ASSERT(S_ISREG(ent[9]->mode)); + TEST_EQUAL_UI(ent[9]->mtime, 1337); + TEST_EQUAL_UI(ent[9]->uid, 42); + TEST_EQUAL_UI(ent[9]->gid, 23); + TEST_STR_EQUAL(ent[10]->name, "dirb/file_b1"); + TEST_ASSERT(S_ISREG(ent[10]->mode)); + TEST_EQUAL_UI(ent[10]->mtime, 1337); + TEST_EQUAL_UI(ent[10]->uid, 42); + TEST_EQUAL_UI(ent[10]->gid, 23); + TEST_STR_EQUAL(ent[11]->name, "dirb/file_b2"); + TEST_ASSERT(S_ISREG(ent[11]->mode)); + TEST_EQUAL_UI(ent[11]->mtime, 1337); + TEST_EQUAL_UI(ent[11]->uid, 42); + TEST_EQUAL_UI(ent[11]->gid, 23); + TEST_STR_EQUAL(ent[12]->name, "dirc"); + TEST_ASSERT(S_ISDIR(ent[12]->mode)); + TEST_EQUAL_UI(ent[12]->mtime, 1337); + TEST_EQUAL_UI(ent[12]->uid, 42); + TEST_EQUAL_UI(ent[12]->gid, 23); + TEST_STR_EQUAL(ent[13]->name, "dirc/file_c0"); + TEST_ASSERT(S_ISREG(ent[13]->mode)); + TEST_EQUAL_UI(ent[13]->mtime, 1337); + TEST_EQUAL_UI(ent[13]->uid, 42); + TEST_EQUAL_UI(ent[13]->gid, 23); + TEST_STR_EQUAL(ent[14]->name, "dirc/file_c1"); + TEST_ASSERT(S_ISREG(ent[14]->mode)); + TEST_EQUAL_UI(ent[14]->mtime, 1337); + TEST_EQUAL_UI(ent[14]->uid, 42); + TEST_EQUAL_UI(ent[14]->gid, 23); + TEST_STR_EQUAL(ent[15]->name, "dirc/file_c2"); + TEST_ASSERT(S_ISREG(ent[15]->mode)); + TEST_EQUAL_UI(ent[15]->mtime, 1337); + TEST_EQUAL_UI(ent[15]->uid, 42); + TEST_EQUAL_UI(ent[15]->gid, 23); + + for (i = 0; i < 16; ++i) + free(ent[i]); + + /* retry with skipping */ + printf("**********\n"); + + dir = dir_tree_iterator_create(TEST_PATH, &cfg); + TEST_NOT_NULL(dir); + + for (i = 0; i < 13; ++i) { + ret = dir->next(dir, &ent[i]); + TEST_NOT_NULL(ent[i]); + TEST_EQUAL_I(ret, 0); + printf("READ %s\n", ent[i]->name); + + if (!strcmp(ent[i]->name, "dirb/dirx")) + dir->ignore_subdir(dir); + } + + ret = dir->next(dir, &ent[13]); + TEST_NULL(ent[13]); + TEST_ASSERT(ret > 0); + + dir = sqfs_drop(dir); + + qsort(ent, 13, sizeof(ent[0]), compare_entries); + + printf("After sort:\n"); + for (i = 0; i < 13; ++i) + printf("%s\n", ent[i]->name); + + TEST_STR_EQUAL(ent[0]->name, "dira"); + TEST_ASSERT(S_ISDIR(ent[0]->mode)); + TEST_STR_EQUAL(ent[1]->name, "dira/file_a0"); + TEST_ASSERT(S_ISREG(ent[1]->mode)); + TEST_STR_EQUAL(ent[2]->name, "dira/file_a1"); + TEST_ASSERT(S_ISREG(ent[2]->mode)); + TEST_STR_EQUAL(ent[3]->name, "dira/file_a2"); + TEST_ASSERT(S_ISREG(ent[3]->mode)); + TEST_STR_EQUAL(ent[4]->name, "dirb"); + TEST_ASSERT(S_ISDIR(ent[4]->mode)); + TEST_STR_EQUAL(ent[5]->name, "dirb/dirx"); + TEST_ASSERT(S_ISDIR(ent[5]->mode)); + TEST_STR_EQUAL(ent[6]->name, "dirb/file_b0"); + TEST_ASSERT(S_ISREG(ent[6]->mode)); + TEST_STR_EQUAL(ent[7]->name, "dirb/file_b1"); + TEST_ASSERT(S_ISREG(ent[7]->mode)); + TEST_STR_EQUAL(ent[8]->name, "dirb/file_b2"); + TEST_ASSERT(S_ISREG(ent[8]->mode)); + TEST_STR_EQUAL(ent[9]->name, "dirc"); + TEST_ASSERT(S_ISDIR(ent[9]->mode)); + TEST_STR_EQUAL(ent[10]->name, "dirc/file_c0"); + TEST_ASSERT(S_ISREG(ent[10]->mode)); + TEST_STR_EQUAL(ent[11]->name, "dirc/file_c1"); + TEST_ASSERT(S_ISREG(ent[11]->mode)); + TEST_STR_EQUAL(ent[12]->name, "dirc/file_c2"); + TEST_ASSERT(S_ISREG(ent[12]->mode)); + + for (i = 0; i < 13; ++i) + free(ent[i]); + + /* retry with skipping */ + printf("**********\n"); + + dir = dir_tree_iterator_create(TEST_PATH, &cfg); + TEST_NOT_NULL(dir); + + for (i = 0; i < 9; ++i) { + ret = dir->next(dir, &ent[i]); + TEST_NOT_NULL(ent[i]); + TEST_EQUAL_I(ret, 0); + printf("READ %s\n", ent[i]->name); + + if (!strcmp(ent[i]->name, "dirb")) + dir->ignore_subdir(dir); + } + + ret = dir->next(dir, &ent[9]); + TEST_NULL(ent[9]); + TEST_ASSERT(ret > 0); + + dir = sqfs_drop(dir); + + qsort(ent, 9, sizeof(ent[0]), compare_entries); + + printf("After sort:\n"); + for (i = 0; i < 9; ++i) + printf("%s\n", ent[i]->name); + + TEST_STR_EQUAL(ent[0]->name, "dira"); + TEST_ASSERT(S_ISDIR(ent[0]->mode)); + TEST_STR_EQUAL(ent[1]->name, "dira/file_a0"); + TEST_ASSERT(S_ISREG(ent[1]->mode)); + TEST_STR_EQUAL(ent[2]->name, "dira/file_a1"); + TEST_ASSERT(S_ISREG(ent[2]->mode)); + TEST_STR_EQUAL(ent[3]->name, "dira/file_a2"); + TEST_ASSERT(S_ISREG(ent[3]->mode)); + TEST_STR_EQUAL(ent[4]->name, "dirb"); + TEST_ASSERT(S_ISDIR(ent[4]->mode)); + TEST_STR_EQUAL(ent[5]->name, "dirc"); + TEST_ASSERT(S_ISDIR(ent[5]->mode)); + TEST_STR_EQUAL(ent[6]->name, "dirc/file_c0"); + TEST_ASSERT(S_ISREG(ent[6]->mode)); + TEST_STR_EQUAL(ent[7]->name, "dirc/file_c1"); + TEST_ASSERT(S_ISREG(ent[7]->mode)); + TEST_STR_EQUAL(ent[8]->name, "dirc/file_c2"); + TEST_ASSERT(S_ISREG(ent[8]->mode)); + + for (i = 0; i < 9; ++i) + free(ent[i]); + + return EXIT_SUCCESS; +} diff --git a/lib/common/test/dir_tree_iterator2.c b/lib/common/test/dir_tree_iterator2.c new file mode 100644 index 0000000..4d92260 --- /dev/null +++ b/lib/common/test/dir_tree_iterator2.c @@ -0,0 +1,225 @@ +/* SPDX-License-Identifier: GPL-3.0-or-later */ +/* + * dir_tree_iterator2.c + * + * Copyright (C) 2023 David Oberhollenzer <goliath@infraroot.at> + */ +#include "config.h" + +#include "dir_tree_iterator.h" +#include "sqfs/error.h" +#include "util/test.h" +#include "sqfs/io.h" +#include "compat.h" +#include "common.h" + +static int compare_entries(const void *a, const void *b) +{ + const sqfs_dir_entry_t *const *lhs = a; + const sqfs_dir_entry_t *const *rhs = b; + + return strcmp((*lhs)->name, (*rhs)->name); +} + +int main(int argc, char **argv) +{ + sqfs_dir_entry_t *ent[17]; + sqfs_dir_iterator_t *dir; + dir_tree_cfg_t cfg; + size_t i; + int ret; + (void)argc; (void)argv; + + /********** without files **********/ + memset(&cfg, 0, sizeof(cfg)); + cfg.flags |= DIR_SCAN_NO_FILE | DIR_SCAN_NO_HARDLINKS; + + dir = dir_tree_iterator_create(TEST_PATH, &cfg); + TEST_NOT_NULL(dir); + + for (i = 0; i < 4; ++i) { + ret = dir->next(dir, &ent[i]); + TEST_NOT_NULL(ent[i]); + TEST_EQUAL_I(ret, 0); + printf("READ %s\n", ent[i]->name); + } + + ret = dir->next(dir, &ent[4]); + TEST_NULL(ent[4]); + TEST_ASSERT(ret > 0); + + dir = sqfs_drop(dir); + + qsort(ent, 4, sizeof(ent[0]), compare_entries); + + printf("After sort:\n"); + for (i = 0; i < 4; ++i) + printf("%s\n", ent[i]->name); + + TEST_STR_EQUAL(ent[0]->name, "dira"); + TEST_ASSERT(S_ISDIR(ent[0]->mode)); + TEST_STR_EQUAL(ent[1]->name, "dirb"); + TEST_ASSERT(S_ISDIR(ent[1]->mode)); + TEST_STR_EQUAL(ent[2]->name, "dirb/dirx"); + TEST_ASSERT(S_ISDIR(ent[2]->mode)); + TEST_STR_EQUAL(ent[3]->name, "dirc"); + TEST_ASSERT(S_ISDIR(ent[3]->mode)); + + for (i = 0; i < 4; ++i) + free(ent[i]); + + /********** recursive but without dirs **********/ + memset(&cfg, 0, sizeof(cfg)); + cfg.flags |= DIR_SCAN_NO_DIR | DIR_SCAN_NO_HARDLINKS; + + dir = dir_tree_iterator_create(TEST_PATH, &cfg); + TEST_NOT_NULL(dir); + + for (i = 0; i < 12; ++i) { + ret = dir->next(dir, &ent[i]); + TEST_NOT_NULL(ent[i]); + TEST_EQUAL_I(ret, 0); + printf("READ %s\n", ent[i]->name); + } + + ret = dir->next(dir, &ent[12]); + TEST_NULL(ent[12]); + TEST_ASSERT(ret > 0); + + dir = sqfs_drop(dir); + + qsort(ent, 12, sizeof(ent[0]), compare_entries); + + printf("After sort:\n"); + for (i = 0; i < 12; ++i) + printf("%s\n", ent[i]->name); + + TEST_STR_EQUAL(ent[0]->name, "dira/file_a0"); + TEST_ASSERT(S_ISREG(ent[0]->mode)); + TEST_STR_EQUAL(ent[1]->name, "dira/file_a1"); + TEST_ASSERT(S_ISREG(ent[1]->mode)); + TEST_STR_EQUAL(ent[2]->name, "dira/file_a2"); + TEST_ASSERT(S_ISREG(ent[2]->mode)); + TEST_STR_EQUAL(ent[3]->name, "dirb/dirx/file_x0"); + TEST_ASSERT(S_ISREG(ent[3]->mode)); + TEST_STR_EQUAL(ent[4]->name, "dirb/dirx/file_x1"); + TEST_ASSERT(S_ISREG(ent[4]->mode)); + TEST_STR_EQUAL(ent[5]->name, "dirb/dirx/file_x2"); + TEST_ASSERT(S_ISREG(ent[5]->mode)); + TEST_STR_EQUAL(ent[6]->name, "dirb/file_b0"); + TEST_ASSERT(S_ISREG(ent[6]->mode)); + TEST_STR_EQUAL(ent[7]->name, "dirb/file_b1"); + TEST_ASSERT(S_ISREG(ent[7]->mode)); + TEST_STR_EQUAL(ent[8]->name, "dirb/file_b2"); + TEST_ASSERT(S_ISREG(ent[8]->mode)); + TEST_STR_EQUAL(ent[9]->name, "dirc/file_c0"); + TEST_ASSERT(S_ISREG(ent[9]->mode)); + TEST_STR_EQUAL(ent[10]->name, "dirc/file_c1"); + TEST_ASSERT(S_ISREG(ent[10]->mode)); + TEST_STR_EQUAL(ent[11]->name, "dirc/file_c2"); + TEST_ASSERT(S_ISREG(ent[11]->mode)); + + for (i = 0; i < 12; ++i) + free(ent[i]); + + /********** non-recursive **********/ + memset(&cfg, 0, sizeof(cfg)); + cfg.flags |= DIR_SCAN_NO_RECURSION | DIR_SCAN_NO_HARDLINKS; + + dir = dir_tree_iterator_create(TEST_PATH, &cfg); + TEST_NOT_NULL(dir); + + for (i = 0; i < 3; ++i) { + ret = dir->next(dir, &ent[i]); + TEST_NOT_NULL(ent[i]); + TEST_EQUAL_I(ret, 0); + printf("READ %s\n", ent[i]->name); + } + + ret = dir->next(dir, &ent[3]); + TEST_NULL(ent[3]); + TEST_ASSERT(ret > 0); + + dir = sqfs_drop(dir); + + qsort(ent, 3, sizeof(ent[0]), compare_entries); + + printf("After sort:\n"); + for (i = 0; i < 3; ++i) + printf("%s\n", ent[i]->name); + + TEST_STR_EQUAL(ent[0]->name, "dira"); + TEST_ASSERT(S_ISDIR(ent[0]->mode)); + TEST_STR_EQUAL(ent[1]->name, "dirb"); + TEST_ASSERT(S_ISDIR(ent[1]->mode)); + TEST_STR_EQUAL(ent[2]->name, "dirc"); + TEST_ASSERT(S_ISDIR(ent[2]->mode)); + + for (i = 0; i < 3; ++i) + free(ent[i]); + + /********** with prefix inserted **********/ + memset(&cfg, 0, sizeof(cfg)); + cfg.prefix = "foobar"; + cfg.flags = DIR_SCAN_NO_HARDLINKS; + + dir = dir_tree_iterator_create(TEST_PATH, &cfg); + TEST_NOT_NULL(dir); + + for (i = 0; i < 16; ++i) { + ret = dir->next(dir, &ent[i]); + TEST_NOT_NULL(ent[i]); + TEST_EQUAL_I(ret, 0); + printf("READ %s\n", ent[i]->name); + } + + ret = dir->next(dir, &ent[16]); + TEST_NULL(ent[16]); + TEST_ASSERT(ret > 0); + + dir = sqfs_drop(dir); + + qsort(ent, 16, sizeof(ent[0]), compare_entries); + + printf("After sort:\n"); + for (i = 0; i < 16; ++i) + printf("%s\n", ent[i]->name); + + TEST_STR_EQUAL(ent[0]->name, "foobar/dira"); + TEST_ASSERT(S_ISDIR(ent[0]->mode)); + TEST_STR_EQUAL(ent[1]->name, "foobar/dira/file_a0"); + TEST_ASSERT(S_ISREG(ent[1]->mode)); + TEST_STR_EQUAL(ent[2]->name, "foobar/dira/file_a1"); + TEST_ASSERT(S_ISREG(ent[2]->mode)); + TEST_STR_EQUAL(ent[3]->name, "foobar/dira/file_a2"); + TEST_ASSERT(S_ISREG(ent[3]->mode)); + TEST_STR_EQUAL(ent[4]->name, "foobar/dirb"); + TEST_ASSERT(S_ISDIR(ent[4]->mode)); + TEST_STR_EQUAL(ent[5]->name, "foobar/dirb/dirx"); + TEST_ASSERT(S_ISDIR(ent[5]->mode)); + TEST_STR_EQUAL(ent[6]->name, "foobar/dirb/dirx/file_x0"); + TEST_ASSERT(S_ISREG(ent[6]->mode)); + TEST_STR_EQUAL(ent[7]->name, "foobar/dirb/dirx/file_x1"); + TEST_ASSERT(S_ISREG(ent[7]->mode)); + TEST_STR_EQUAL(ent[8]->name, "foobar/dirb/dirx/file_x2"); + TEST_ASSERT(S_ISREG(ent[8]->mode)); + TEST_STR_EQUAL(ent[9]->name, "foobar/dirb/file_b0"); + TEST_ASSERT(S_ISREG(ent[9]->mode)); + TEST_STR_EQUAL(ent[10]->name, "foobar/dirb/file_b1"); + TEST_ASSERT(S_ISREG(ent[10]->mode)); + TEST_STR_EQUAL(ent[11]->name, "foobar/dirb/file_b2"); + TEST_ASSERT(S_ISREG(ent[11]->mode)); + TEST_STR_EQUAL(ent[12]->name, "foobar/dirc"); + TEST_ASSERT(S_ISDIR(ent[12]->mode)); + TEST_STR_EQUAL(ent[13]->name, "foobar/dirc/file_c0"); + TEST_ASSERT(S_ISREG(ent[13]->mode)); + TEST_STR_EQUAL(ent[14]->name, "foobar/dirc/file_c1"); + TEST_ASSERT(S_ISREG(ent[14]->mode)); + TEST_STR_EQUAL(ent[15]->name, "foobar/dirc/file_c2"); + TEST_ASSERT(S_ISREG(ent[15]->mode)); + + for (i = 0; i < 16; ++i) + free(ent[i]); + + return EXIT_SUCCESS; +} diff --git a/lib/common/test/dir_tree_iterator3.c b/lib/common/test/dir_tree_iterator3.c new file mode 100644 index 0000000..612a7eb --- /dev/null +++ b/lib/common/test/dir_tree_iterator3.c @@ -0,0 +1,108 @@ +/* SPDX-License-Identifier: GPL-3.0-or-later */ +/* + * dir_tree_iterator2.c + * + * Copyright (C) 2023 David Oberhollenzer <goliath@infraroot.at> + */ +#include "config.h" + +#include "dir_tree_iterator.h" +#include "sqfs/error.h" +#include "util/test.h" +#include "sqfs/io.h" +#include "compat.h" +#include "common.h" + +static int compare_entries(const void *a, const void *b) +{ + const sqfs_dir_entry_t *const *lhs = a; + const sqfs_dir_entry_t *const *rhs = b; + + return strcmp((*lhs)->name, (*rhs)->name); +} + +int main(int argc, char **argv) +{ + sqfs_dir_entry_t *ent[17]; + sqfs_dir_iterator_t *dir; + dir_tree_cfg_t cfg; + size_t i; + int ret; + (void)argc; (void)argv; + + /********** match name **********/ + memset(&cfg, 0, sizeof(cfg)); + cfg.name_pattern = "file_x*"; + cfg.flags = DIR_SCAN_NO_HARDLINKS; + + dir = dir_tree_iterator_create(TEST_PATH, &cfg); + TEST_NOT_NULL(dir); + + for (i = 0; i < 3; ++i) { + ret = dir->next(dir, &ent[i]); + TEST_NOT_NULL(ent[i]); + TEST_EQUAL_I(ret, 0); + printf("READ %s\n", ent[i]->name); + } + + ret = dir->next(dir, &ent[3]); + TEST_NULL(ent[3]); + TEST_ASSERT(ret > 0); + + dir = sqfs_drop(dir); + + qsort(ent, 3, sizeof(ent[0]), compare_entries); + + printf("After sort:\n"); + for (i = 0; i < 3; ++i) + printf("%s\n", ent[i]->name); + + TEST_STR_EQUAL(ent[0]->name, "dirb/dirx/file_x0"); + TEST_ASSERT(S_ISREG(ent[0]->mode)); + TEST_STR_EQUAL(ent[1]->name, "dirb/dirx/file_x1"); + TEST_ASSERT(S_ISREG(ent[1]->mode)); + TEST_STR_EQUAL(ent[2]->name, "dirb/dirx/file_x2"); + TEST_ASSERT(S_ISREG(ent[2]->mode)); + + for (i = 0; i < 3; ++i) + free(ent[i]); + + /********** match path **********/ + memset(&cfg, 0, sizeof(cfg)); + cfg.name_pattern = "dir*/file_*0"; + cfg.flags |= DIR_SCAN_MATCH_FULL_PATH | DIR_SCAN_NO_HARDLINKS; + + dir = dir_tree_iterator_create(TEST_PATH, &cfg); + TEST_NOT_NULL(dir); + + for (i = 0; i < 3; ++i) { + ret = dir->next(dir, &ent[i]); + TEST_NOT_NULL(ent[i]); + TEST_EQUAL_I(ret, 0); + printf("READ %s\n", ent[i]->name); + } + + ret = dir->next(dir, &ent[3]); + TEST_NULL(ent[3]); + TEST_ASSERT(ret > 0); + + dir = sqfs_drop(dir); + + qsort(ent, 3, sizeof(ent[0]), compare_entries); + + printf("After sort:\n"); + for (i = 0; i < 3; ++i) + printf("%s\n", ent[i]->name); + + TEST_STR_EQUAL(ent[0]->name, "dira/file_a0"); + TEST_ASSERT(S_ISREG(ent[0]->mode)); + TEST_STR_EQUAL(ent[1]->name, "dirb/file_b0"); + TEST_ASSERT(S_ISREG(ent[1]->mode)); + TEST_STR_EQUAL(ent[2]->name, "dirc/file_c0"); + TEST_ASSERT(S_ISREG(ent[2]->mode)); + + for (i = 0; i < 3; ++i) + free(ent[i]); + + return EXIT_SUCCESS; +} |