diff options
author | David Oberhollenzer <david.oberhollenzer@sigma-star.at> | 2023-05-20 17:04:15 +0200 |
---|---|---|
committer | David Oberhollenzer <david.oberhollenzer@sigma-star.at> | 2023-05-22 16:15:45 +0200 |
commit | 6351872732fce77186f401050eee92c7c3aa3461 (patch) | |
tree | c938233378d13dbc94e08f24e34bb84406b08d21 /lib/tar/Makemodule.am | |
parent | 9a97a9a4fe224bcf53ad23af31bca67bbb71a824 (diff) |
libtar: add a dir_iterator_t implementation for tar files
The existing istream_t wrapper is mered into this one as well, we
can open the files via the iterators open_file_ro function. Unit
tests and tar2sqfs are modified accordingly.
Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
Diffstat (limited to 'lib/tar/Makemodule.am')
-rw-r--r-- | lib/tar/Makemodule.am | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/lib/tar/Makemodule.am b/lib/tar/Makemodule.am index 07eb497..7e58cc6 100644 --- a/lib/tar/Makemodule.am +++ b/lib/tar/Makemodule.am @@ -3,7 +3,8 @@ libtar_a_SOURCES = lib/tar/src/read_header.c lib/tar/src/write_header.c \ lib/tar/src/read_sparse_map_old.c lib/tar/src/internal.h \ lib/tar/src/padd_file.c lib/tar/src/record_to_memory.c \ lib/tar/src/pax_header.c lib/tar/src/read_sparse_map_new.c \ - lib/tar/src/istream.c include/tar/tar.h include/tar/format.h + lib/tar/src/iterator.c \ + include/tar/tar.h include/tar/format.h noinst_LIBRARIES += libtar.a @@ -162,19 +163,19 @@ test_tar_xattr_schily_bin_LDADD = libtar.a libio.a libutil.a libcompat.a test_tar_xattr_schily_bin_CPPFLAGS = $(AM_CPPFLAGS) -DTESTPATH=$(TARDATADIR) test_tar_xattr_schily_bin_CPPFLAGS += -DTESTFILE=xattr/xattr-schily-binary.tar -test_tar_istream_SOURCES = lib/tar/test/tar_istream.c -test_tar_istream_LDADD = libtar.a libio.a libutil.a libcompat.a -test_tar_istream_CPPFLAGS = $(AM_CPPFLAGS) -DTESTPATH=$(TARDATADIR) -test_tar_istream_CPPFLAGS += -DTESTFILE=format-acceptance/gnu.tar +test_tar_iterator_SOURCES = lib/tar/test/tar_iterator.c +test_tar_iterator_LDADD = libtar.a libio.a libutil.a libcompat.a +test_tar_iterator_CPPFLAGS = $(AM_CPPFLAGS) -DTESTPATH=$(TARDATADIR) +test_tar_iterator_CPPFLAGS += -DTESTFILE=format-acceptance/gnu.tar -test_tar_istream2_SOURCES = lib/tar/test/tar_istream2.c -test_tar_istream2_LDADD = libtar.a libio.a libutil.a libcompat.a -test_tar_istream2_CPPFLAGS = $(AM_CPPFLAGS) -DTESTPATH=$(TARDATADIR) +test_tar_iterator2_SOURCES = lib/tar/test/tar_iterator2.c +test_tar_iterator2_LDADD = libtar.a libio.a libutil.a libcompat.a +test_tar_iterator2_CPPFLAGS = $(AM_CPPFLAGS) -DTESTPATH=$(TARDATADIR) +test_tar_iterator2_CPPFLAGS += -DTESTFILE=iterator/sparse.tar -test_tar_istream3_SOURCES = lib/tar/test/tar_istream3.c -test_tar_istream3_LDADD = libtar.a libio.a libutil.a libcompat.a -test_tar_istream3_CPPFLAGS = $(AM_CPPFLAGS) -DTESTPATH=$(TARDATADIR) -test_tar_istream3_CPPFLAGS += -DTESTFILE=istream/sparse.tar +test_tar_iterator3_SOURCES = lib/tar/test/tar_iterator3.c +test_tar_iterator3_LDADD = libtar.a libio.a libutil.a libcompat.a +test_tar_iterator3_CPPFLAGS = $(AM_CPPFLAGS) -DTESTPATH=$(TARDATADIR) tar_fuzz_SOURCES = lib/tar/test/tar_fuzz.c tar_fuzz_LDADD = libtar.a libio.a libutil.a libcompat.a @@ -195,7 +196,7 @@ LIBTAR_TESTS = \ test_tar_sparse_gnu2 test_tar_sparse_gnu3 \ test_tar_xattr_bsd test_tar_xattr_schily test_tar_xattr_schily_bin \ test_tar_target_filled \ - test_tar_istream test_tar_istream2 test_tar_istream3 \ + test_tar_iterator test_tar_iterator2 test_tar_iterator3 \ test_tar_write_simple check_PROGRAMS += $(LIBTAR_TESTS) |