Move directory iterator from libutil to libio

Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>

16 files changed, 945 insertions, 0 deletions

diff --git a/lib/io/test/dir_iterator.c b/lib/io/test/dir_iterator.c
new file mode 100644
index 0000000..57e76ab
--- /dev/null
+++ b/lib/io/test/dir_iterator.c
@@ -0,0 +1,367 @@
+/* SPDX-License-Identifier: GPL-3.0-or-later */
+/*
+ * dir_iterator.c
+ *
+ * Copyright (C) 2019 David Oberhollenzer <goliath@infraroot.at>
+ */
+#include "config.h"
+
+#include "io/dir_iterator.h"
+#include "sqfs/error.h"
+#include "util/test.h"
+#include "compat.h"
+
+static int compare_entries(const void *a, const void *b)
+{
+	const dir_entry_t *const *lhs = a;
+	const dir_entry_t *const *rhs = b;
+
+	return strcmp((*lhs)->name, (*rhs)->name);
+}
+
+int main(int argc, char **argv)
+{
+	dir_iterator_t *dir, *suba, *subb, *subc, *sub;
+	dir_entry_t *dent, *ent[6];
+	size_t i;
+	int ret;
+	(void)argc; (void)argv;
+
+	/* scan the top level hierarchy */
+	dir = dir_iterator_create(TEST_PATH);
+	TEST_NOT_NULL(dir);
+
+	ret = dir->next(dir, &ent[0]);
+	TEST_NOT_NULL(ent[0]);
+	TEST_EQUAL_I(ret, 0);
+
+	ret = dir->next(dir, &ent[1]);
+	TEST_NOT_NULL(ent[1]);
+	TEST_EQUAL_I(ret, 0);
+
+	ret = dir->next(dir, &ent[2]);
+	TEST_NOT_NULL(ent[2]);
+	TEST_EQUAL_I(ret, 0);
+
+	ret = dir->next(dir, &ent[3]);
+	TEST_NOT_NULL(ent[3]);
+	TEST_EQUAL_I(ret, 0);
+
+	ret = dir->next(dir, &ent[4]);
+	TEST_NOT_NULL(ent[4]);
+	TEST_EQUAL_I(ret, 0);
+
+	ret = dir->next(dir, &ent[5]);
+	TEST_NULL(ent[5]);
+	TEST_ASSERT(ret > 0);
+
+	dir = sqfs_drop(dir);
+
+	qsort(ent, 5, sizeof(ent[0]), compare_entries);
+
+	TEST_STR_EQUAL(ent[0]->name, ".");
+	TEST_ASSERT(S_ISDIR(ent[0]->mode));
+	TEST_STR_EQUAL(ent[1]->name, "..");
+	TEST_ASSERT(S_ISDIR(ent[1]->mode));
+	TEST_STR_EQUAL(ent[2]->name, "dira");
+	TEST_ASSERT(S_ISDIR(ent[2]->mode));
+	TEST_STR_EQUAL(ent[3]->name, "dirb");
+	TEST_ASSERT(S_ISDIR(ent[3]->mode));
+	TEST_STR_EQUAL(ent[4]->name, "dirc");
+	TEST_ASSERT(S_ISDIR(ent[4]->mode));
+
+	for (i = 0; i < 5; ++i)
+		free(ent[i]);
+
+	/* scan first sub hierarchy */
+	dir = dir_iterator_create(TEST_PATH "/dira");
+	TEST_NOT_NULL(dir);
+
+	ret = dir->next(dir, &ent[0]);
+	TEST_NOT_NULL(ent[0]);
+	TEST_EQUAL_I(ret, 0);
+
+	ret = dir->next(dir, &ent[1]);
+	TEST_NOT_NULL(ent[1]);
+	TEST_EQUAL_I(ret, 0);
+
+	ret = dir->next(dir, &ent[2]);
+	TEST_NOT_NULL(ent[2]);
+	TEST_EQUAL_I(ret, 0);
+
+	ret = dir->next(dir, &ent[3]);
+	TEST_NOT_NULL(ent[3]);
+	TEST_EQUAL_I(ret, 0);
+
+	ret = dir->next(dir, &ent[4]);
+	TEST_NOT_NULL(ent[4]);
+	TEST_EQUAL_I(ret, 0);
+
+	ret = dir->next(dir, &ent[5]);
+	TEST_NULL(ent[5]);
+	TEST_ASSERT(ret > 0);
+
+	dir = sqfs_drop(dir);
+
+	qsort(ent, 5, sizeof(ent[0]), compare_entries);
+
+	TEST_STR_EQUAL(ent[0]->name, ".");
+	TEST_ASSERT(S_ISDIR(ent[0]->mode));
+	TEST_STR_EQUAL(ent[1]->name, "..");
+	TEST_ASSERT(S_ISDIR(ent[1]->mode));
+	TEST_STR_EQUAL(ent[2]->name, "file_a0");
+	TEST_ASSERT(S_ISREG(ent[2]->mode));
+	TEST_STR_EQUAL(ent[3]->name, "file_a1");
+	TEST_ASSERT(S_ISREG(ent[3]->mode));
+	TEST_STR_EQUAL(ent[4]->name, "file_a2");
+	TEST_ASSERT(S_ISREG(ent[4]->mode));
+
+	for (i = 0; i < 5; ++i)
+		free(ent[i]);
+
+	/* scan second sub hierarchy */
+	dir = dir_iterator_create(TEST_PATH "/dirb");
+	TEST_NOT_NULL(dir);
+
+	ret = dir->next(dir, &ent[0]);
+	TEST_NOT_NULL(ent[0]);
+	TEST_EQUAL_I(ret, 0);
+
+	ret = dir->next(dir, &ent[1]);
+	TEST_NOT_NULL(ent[1]);
+	TEST_EQUAL_I(ret, 0);
+
+	ret = dir->next(dir, &ent[2]);
+	TEST_NOT_NULL(ent[2]);
+	TEST_EQUAL_I(ret, 0);
+
+	ret = dir->next(dir, &ent[3]);
+	TEST_NOT_NULL(ent[3]);
+	TEST_EQUAL_I(ret, 0);
+
+	ret = dir->next(dir, &ent[4]);
+	TEST_NOT_NULL(ent[4]);
+	TEST_EQUAL_I(ret, 0);
+
+	ret = dir->next(dir, &ent[5]);
+	TEST_NOT_NULL(ent[5]);
+	TEST_EQUAL_I(ret, 0);
+
+	ret = dir->next(dir, &dent);
+	TEST_NULL(dent);
+	TEST_ASSERT(ret > 0);
+
+	dir = sqfs_drop(dir);
+
+	qsort(ent, 6, sizeof(ent[0]), compare_entries);
+
+	TEST_STR_EQUAL(ent[0]->name, ".");
+	TEST_ASSERT(S_ISDIR(ent[0]->mode));
+	TEST_STR_EQUAL(ent[1]->name, "..");
+	TEST_ASSERT(S_ISDIR(ent[1]->mode));
+	TEST_STR_EQUAL(ent[2]->name, "dirx");
+	TEST_ASSERT(S_ISDIR(ent[2]->mode));
+	TEST_STR_EQUAL(ent[3]->name, "file_b0");
+	TEST_ASSERT(S_ISREG(ent[3]->mode));
+	TEST_STR_EQUAL(ent[4]->name, "file_b1");
+	TEST_ASSERT(S_ISREG(ent[4]->mode));
+	TEST_STR_EQUAL(ent[5]->name, "file_b2");
+	TEST_ASSERT(S_ISREG(ent[5]->mode));
+
+	for (i = 0; i < 6; ++i)
+		free(ent[i]);
+
+	/* scan first sub hierarchy */
+	dir = dir_iterator_create(TEST_PATH "/dirc");
+	TEST_NOT_NULL(dir);
+
+	ret = dir->next(dir, &ent[0]);
+	TEST_NOT_NULL(ent[0]);
+	TEST_EQUAL_I(ret, 0);
+
+	ret = dir->next(dir, &ent[1]);
+	TEST_NOT_NULL(ent[1]);
+	TEST_EQUAL_I(ret, 0);
+
+	ret = dir->next(dir, &ent[2]);
+	TEST_NOT_NULL(ent[2]);
+	TEST_EQUAL_I(ret, 0);
+
+	ret = dir->next(dir, &ent[3]);
+	TEST_NOT_NULL(ent[3]);
+	TEST_EQUAL_I(ret, 0);
+
+	ret = dir->next(dir, &ent[4]);
+	TEST_NOT_NULL(ent[4]);
+	TEST_EQUAL_I(ret, 0);
+
+	ret = dir->next(dir, &ent[5]);
+	TEST_NULL(ent[5]);
+	TEST_ASSERT(ret > 0);
+
+	dir = sqfs_drop(dir);
+
+	qsort(ent, 5, sizeof(ent[0]), compare_entries);
+
+	TEST_STR_EQUAL(ent[0]->name, ".");
+	TEST_ASSERT(S_ISDIR(ent[0]->mode));
+	TEST_STR_EQUAL(ent[1]->name, "..");
+	TEST_ASSERT(S_ISDIR(ent[1]->mode));
+	TEST_STR_EQUAL(ent[2]->name, "file_c0");
+	TEST_ASSERT(S_ISREG(ent[2]->mode));
+	TEST_STR_EQUAL(ent[3]->name, "file_c1");
+	TEST_ASSERT(S_ISREG(ent[3]->mode));
+	TEST_STR_EQUAL(ent[4]->name, "file_c2");
+	TEST_ASSERT(S_ISREG(ent[4]->mode));
+
+	for (i = 0; i < 5; ++i)
+		free(ent[i]);
+
+	/* test sub directory iterators */
+	suba = NULL;
+	subb = NULL;
+	subc = NULL;
+
+	dir = dir_iterator_create(TEST_PATH);
+	TEST_NOT_NULL(dir);
+
+	for (i = 0; i < 5; ++i) {
+		ret = dir->next(dir, &dent);
+		TEST_NOT_NULL(dent);
+		TEST_EQUAL_I(ret, 0);
+
+		if (!strcmp(dent->name, "dira")) {
+			TEST_NULL(suba);
+			ret = dir->open_subdir(dir, &suba);
+			TEST_NOT_NULL(suba);
+			TEST_EQUAL_I(ret, 0);
+		} else if (!strcmp(dent->name, "dirb")) {
+			TEST_NULL(subb);
+			ret = dir->open_subdir(dir, &subb);
+			TEST_NOT_NULL(subb);
+			TEST_EQUAL_I(ret, 0);
+		} else if (!strcmp(dent->name, "dirc")) {
+			TEST_NULL(subc);
+			ret = dir->open_subdir(dir, &subc);
+			TEST_NOT_NULL(subc);
+			TEST_EQUAL_I(ret, 0);
+		}
+
+		free(dent);
+	}
+
+	ret = dir->next(dir, &dent);
+	TEST_NULL(dent);
+	TEST_ASSERT(ret > 0);
+	dir = sqfs_drop(dir);
+
+	TEST_NOT_NULL(suba);
+	TEST_NOT_NULL(subb);
+	TEST_NOT_NULL(subc);
+
+	/* sub iterator a */
+	for (i = 0; i < 5; ++i) {
+		ret = suba->next(suba, &ent[i]);
+		TEST_NOT_NULL(ent[0]);
+		TEST_EQUAL_I(ret, 0);
+
+		if (S_ISREG(ent[i]->mode)) {
+			ret = suba->open_subdir(suba, &sub);
+			TEST_NULL(sub);
+			TEST_EQUAL_I(ret, SQFS_ERROR_NOT_DIR);
+		}
+	}
+
+	ret = suba->next(suba, &dent);
+	TEST_NULL(dent);
+	TEST_ASSERT(ret > 0);
+	suba = sqfs_drop(suba);
+
+	qsort(ent, 5, sizeof(ent[0]), compare_entries);
+
+	TEST_STR_EQUAL(ent[0]->name, ".");
+	TEST_ASSERT(S_ISDIR(ent[0]->mode));
+	TEST_STR_EQUAL(ent[1]->name, "..");
+	TEST_ASSERT(S_ISDIR(ent[1]->mode));
+	TEST_STR_EQUAL(ent[2]->name, "file_a0");
+	TEST_ASSERT(S_ISREG(ent[2]->mode));
+	TEST_STR_EQUAL(ent[3]->name, "file_a1");
+	TEST_ASSERT(S_ISREG(ent[3]->mode));
+	TEST_STR_EQUAL(ent[4]->name, "file_a2");
+	TEST_ASSERT(S_ISREG(ent[4]->mode));
+
+	for (i = 0; i < 5; ++i)
+		free(ent[i]);
+
+	/* sub iterator b */
+	for (i = 0; i < 6; ++i) {
+		ret = subb->next(subb, &ent[i]);
+		TEST_NOT_NULL(ent[0]);
+		TEST_EQUAL_I(ret, 0);
+
+		if (S_ISREG(ent[i]->mode)) {
+			ret = subb->open_subdir(subb, &sub);
+			TEST_NULL(sub);
+			TEST_EQUAL_I(ret, SQFS_ERROR_NOT_DIR);
+		}
+	}
+
+	ret = subb->next(subb, &dent);
+	TEST_NULL(dent);
+	TEST_ASSERT(ret > 0);
+	subb = sqfs_drop(subb);
+
+	qsort(ent, 6, sizeof(ent[0]), compare_entries);
+
+	TEST_STR_EQUAL(ent[0]->name, ".");
+	TEST_ASSERT(S_ISDIR(ent[0]->mode));
+	TEST_STR_EQUAL(ent[1]->name, "..");
+	TEST_ASSERT(S_ISDIR(ent[1]->mode));
+	TEST_STR_EQUAL(ent[2]->name, "dirx");
+	TEST_ASSERT(S_ISDIR(ent[2]->mode));
+	TEST_STR_EQUAL(ent[3]->name, "file_b0");
+	TEST_ASSERT(S_ISREG(ent[3]->mode));
+	TEST_STR_EQUAL(ent[4]->name, "file_b1");
+	TEST_ASSERT(S_ISREG(ent[4]->mode));
+	TEST_STR_EQUAL(ent[5]->name, "file_b2");
+	TEST_ASSERT(S_ISREG(ent[5]->mode));
+
+	for (i = 0; i < 6; ++i)
+		free(ent[i]);
+
+	/* sub iterator c */
+	for (i = 0; i < 5; ++i) {
+		ret = subc->next(subc, &ent[i]);
+		TEST_NOT_NULL(ent[0]);
+		TEST_EQUAL_I(ret, 0);
+
+		if (S_ISREG(ent[i]->mode)) {
+			ret = subc->open_subdir(subc, &sub);
+			TEST_NULL(sub);
+			TEST_EQUAL_I(ret, SQFS_ERROR_NOT_DIR);
+		}
+	}
+
+	ret = subc->next(subc, &dent);
+	TEST_NULL(dent);
+	TEST_ASSERT(ret > 0);
+	subc = sqfs_drop(subc);
+
+	qsort(ent, 5, sizeof(ent[0]), compare_entries);
+
+	TEST_STR_EQUAL(ent[0]->name, ".");
+	TEST_ASSERT(S_ISDIR(ent[0]->mode));
+	TEST_STR_EQUAL(ent[1]->name, "..");
+	TEST_ASSERT(S_ISDIR(ent[1]->mode));
+	TEST_STR_EQUAL(ent[2]->name, "file_c0");
+	TEST_ASSERT(S_ISREG(ent[2]->mode));
+	TEST_STR_EQUAL(ent[3]->name, "file_c1");
+	TEST_ASSERT(S_ISREG(ent[3]->mode));
+	TEST_STR_EQUAL(ent[4]->name, "file_c2");
+	TEST_ASSERT(S_ISREG(ent[4]->mode));
+
+	for (i = 0; i < 5; ++i)
+		free(ent[i]);
+
+	return EXIT_SUCCESS;
+}
diff --git a/lib/io/test/dir_tree_iterator.c b/lib/io/test/dir_tree_iterator.c
new file mode 100644
index 0000000..75e32fb
--- /dev/null
+++ b/lib/io/test/dir_tree_iterator.c
@@ -0,0 +1,251 @@
+/* SPDX-License-Identifier: GPL-3.0-or-later */
+/*
+ * dir_tree_iterator.c
+ *
+ * Copyright (C) 2019 David Oberhollenzer <goliath@infraroot.at>
+ */
+#include "config.h"
+
+#include "io/dir_tree_iterator.h"
+#include "sqfs/error.h"
+#include "util/test.h"
+#include "compat.h"
+
+static int compare_entries(const void *a, const void *b)
+{
+	const dir_entry_t *const *lhs = a;
+	const dir_entry_t *const *rhs = b;
+
+	return strcmp((*lhs)->name, (*rhs)->name);
+}
+
+int main(int argc, char **argv)
+{
+	dir_entry_t *ent[17];
+	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;
+
+	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_tree_iterator_skip(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_tree_iterator_skip(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/io/test/dir_tree_iterator2.c b/lib/io/test/dir_tree_iterator2.c
new file mode 100644
index 0000000..d3c4990
--- /dev/null
+++ b/lib/io/test/dir_tree_iterator2.c
@@ -0,0 +1,222 @@
+/* SPDX-License-Identifier: GPL-3.0-or-later */
+/*
+ * dir_tree_iterator2.c
+ *
+ * Copyright (C) 2023 David Oberhollenzer <goliath@infraroot.at>
+ */
+#include "config.h"
+
+#include "io/dir_tree_iterator.h"
+#include "sqfs/error.h"
+#include "util/test.h"
+#include "compat.h"
+
+static int compare_entries(const void *a, const void *b)
+{
+	const dir_entry_t *const *lhs = a;
+	const dir_entry_t *const *rhs = b;
+
+	return strcmp((*lhs)->name, (*rhs)->name);
+}
+
+int main(int argc, char **argv)
+{
+	dir_entry_t *ent[17];
+	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 = 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 = 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 = 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";
+
+	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/io/test/dir_tree_iterator3.c b/lib/io/test/dir_tree_iterator3.c
new file mode 100644
index 0000000..6fce085
--- /dev/null
+++ b/lib/io/test/dir_tree_iterator3.c
@@ -0,0 +1,105 @@
+/* SPDX-License-Identifier: GPL-3.0-or-later */
+/*
+ * dir_tree_iterator2.c
+ *
+ * Copyright (C) 2023 David Oberhollenzer <goliath@infraroot.at>
+ */
+#include "config.h"
+
+#include "io/dir_tree_iterator.h"
+#include "sqfs/error.h"
+#include "util/test.h"
+#include "compat.h"
+
+static int compare_entries(const void *a, const void *b)
+{
+	const dir_entry_t *const *lhs = a;
+	const dir_entry_t *const *rhs = b;
+
+	return strcmp((*lhs)->name, (*rhs)->name);
+}
+
+int main(int argc, char **argv)
+{
+	dir_entry_t *ent[17];
+	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*";
+
+	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 = 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;
+}
diff --git a/lib/io/test/testdir/dira/file_a0 b/lib/io/test/testdir/dira/file_a0
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/lib/io/test/testdir/dira/file_a0
diff --git a/lib/io/test/testdir/dira/file_a1 b/lib/io/test/testdir/dira/file_a1
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/lib/io/test/testdir/dira/file_a1
diff --git a/lib/io/test/testdir/dira/file_a2 b/lib/io/test/testdir/dira/file_a2
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/lib/io/test/testdir/dira/file_a2
diff --git a/lib/io/test/testdir/dirb/dirx/file_x0 b/lib/io/test/testdir/dirb/dirx/file_x0
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/lib/io/test/testdir/dirb/dirx/file_x0
diff --git a/lib/io/test/testdir/dirb/dirx/file_x1 b/lib/io/test/testdir/dirb/dirx/file_x1
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/lib/io/test/testdir/dirb/dirx/file_x1
diff --git a/lib/io/test/testdir/dirb/dirx/file_x2 b/lib/io/test/testdir/dirb/dirx/file_x2
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/lib/io/test/testdir/dirb/dirx/file_x2
diff --git a/lib/io/test/testdir/dirb/file_b0 b/lib/io/test/testdir/dirb/file_b0
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/lib/io/test/testdir/dirb/file_b0
diff --git a/lib/io/test/testdir/dirb/file_b1 b/lib/io/test/testdir/dirb/file_b1
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/lib/io/test/testdir/dirb/file_b1
diff --git a/lib/io/test/testdir/dirb/file_b2 b/lib/io/test/testdir/dirb/file_b2
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/lib/io/test/testdir/dirb/file_b2
diff --git a/lib/io/test/testdir/dirc/file_c0 b/lib/io/test/testdir/dirc/file_c0
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/lib/io/test/testdir/dirc/file_c0
diff --git a/lib/io/test/testdir/dirc/file_c1 b/lib/io/test/testdir/dirc/file_c1
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/lib/io/test/testdir/dirc/file_c1
diff --git a/lib/io/test/testdir/dirc/file_c2 b/lib/io/test/testdir/dirc/file_c2
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/lib/io/test/testdir/dirc/file_c2