From 5a3b741b92b793be7221a481efca316aec208ebe Mon Sep 17 00:00:00 2001 From: David Oberhollenzer Date: Tue, 18 Jul 2023 21:54:50 +0200 Subject: Add a data reader based sqfs_istream_t implementation To the sqfs_data_reader_t is added, an sqfs_istream_t implementation that internally reads through the data reader. The uses of the data_reader_dump function are removed and the function is subsequently removed from libcommon. Signed-off-by: David Oberhollenzer --- bin/sqfsdiff/src/extract.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) (limited to 'bin/sqfsdiff/src') diff --git a/bin/sqfsdiff/src/extract.c b/bin/sqfsdiff/src/extract.c index cbc4381..df74f0f 100644 --- a/bin/sqfsdiff/src/extract.c +++ b/bin/sqfsdiff/src/extract.c @@ -11,6 +11,7 @@ static int extract(sqfs_data_reader_t *data, const sqfs_inode_generic_t *inode, { char *ptr, *temp; sqfs_ostream_t *fp; + sqfs_istream_t *in; int ret; temp = alloca(strlen(prefix) + strlen(path) + 2); @@ -28,12 +29,23 @@ static int extract(sqfs_data_reader_t *data, const sqfs_inode_generic_t *inode, return -1; } - if (sqfs_data_reader_dump(path, data, inode, fp, block_size)) { + ret = sqfs_data_reader_create_stream(data, inode, path, &in); + if (ret) { sqfs_drop(fp); return -1; } - ret = fp->flush(fp); + do { + ret = sqfs_istream_splice(in, fp, block_size); + if (ret < 0) + sqfs_perror(path, "splicing data", ret); + } while (ret > 0); + + sqfs_drop(in); + + if (ret == 0) + ret = fp->flush(fp); + if (ret) { sqfs_perror(fp->get_filename(fp), NULL, ret); sqfs_drop(fp); -- cgit v1.2.3