aboutsummaryrefslogtreecommitdiff
path: root/lib/common/test
diff options
context:
space:
mode:
authorDavid Oberhollenzer <david.oberhollenzer@sigma-star.at>2023-09-23 11:16:46 +0200
committerDavid Oberhollenzer <david.oberhollenzer@sigma-star.at>2023-10-24 15:57:18 +0200
commit9f2d63162e82d423faeda9c7449d6edd819e4591 (patch)
treefa22cd6a89655ef9726c64336be47a209bac1a15 /lib/common/test
parentee26abcab9faf037cf87438cca20d54e5b0edd05 (diff)
Cleanup: remove rest of libioHEADmaster
Move the directory iterator test to libsquashfs, move the tree scanning code to libcommon. Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
Diffstat (limited to 'lib/common/test')
-rw-r--r--lib/common/test/dir_tree_iterator.c254
-rw-r--r--lib/common/test/dir_tree_iterator2.c225
-rw-r--r--lib/common/test/dir_tree_iterator3.c108
3 files changed, 587 insertions, 0 deletions
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;
+}