From 9d431639effb4e33169110031a689fd1e9d435cf Mon Sep 17 00:00:00 2001 From: David Oberhollenzer Date: Tue, 18 Jul 2023 20:44:01 +0200 Subject: Split recursive directory iterator The recursive part and the filter part are split up, the recursive iterator wrapper is moved into libsquashfs and the libio iterator is modified to use that internally instead of implementig the recursion step. Signed-off-by: David Oberhollenzer --- lib/sqfs/Makemodule.am | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'lib/sqfs/Makemodule.am') diff --git a/lib/sqfs/Makemodule.am b/lib/sqfs/Makemodule.am index 5005c48..053dab8 100644 --- a/lib/sqfs/Makemodule.am +++ b/lib/sqfs/Makemodule.am @@ -34,7 +34,8 @@ libsquashfs_la_SOURCES = $(LIBSQFS_HEARDS) lib/sqfs/src/id_table.c \ lib/sqfs/src/frag_table.c lib/sqfs/src/block_writer.c \ lib/sqfs/src/misc.c lib/sqfs/src/io/istream.c \ lib/sqfs/src/io/ostream.c lib/sqfs/src/io/file.c \ - lib/sqfs/src/io/stream_api.c lib/sqfs/src/dir_entry.c + lib/sqfs/src/io/stream_api.c lib/sqfs/src/dir_entry.c \ + lib/sqfs/src/io/dir_rec.c libsquashfs_la_CPPFLAGS = $(AM_CPPFLAGS) libsquashfs_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(LIBSQUASHFS_SO_VERSION) libsquashfs_la_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS) $(ZLIB_CFLAGS) @@ -136,9 +137,12 @@ test_istream_skip_LDADD = libsquashfs.la libio.a libutil.a libcompat.a test_stream_splice_SOURCES = lib/sqfs/test/stream_splice.c test_stream_splice_LDADD = libsquashfs.la libio.a libutil.a libcompat.a +test_rec_dir_SOURCES = lib/sqfs/test/rec_dir.c +test_rec_dir_LDADD = libsquashfs.la libio.a libutil.a libcompat.a + LIBSQFS_TESTS = \ test_abi test_xattr test_table test_xattr_writer test_get_node_path \ - test_istream_read test_istream_skip test_stream_splice + test_istream_read test_istream_skip test_stream_splice test_rec_dir noinst_PROGRAMS += xattr_benchmark check_PROGRAMS += $(LIBSQFS_TESTS) -- cgit v1.2.3