test: add check for copying file_iterators

common/src/reader/reader.c

@@ -71,31 +71,38 @@ sqsh__reader_copy(
 		void *copied_iterator) {
 	int rv = 0;
 
+	const struct SqshReaderIteratorImpl *impl = source->iterator_impl;
+	if (impl == NULL) {
+		goto out;
+	}
 	target->iterator = copied_iterator;
-	target->iterator_impl = source->iterator_impl;
+	target->iterator_impl = impl;
 	target->iterator_offset = source->iterator_offset;
 	target->offset = source->offset;
+
 	const uint8_t *buffer_data = cx_buffer_data(&source->buffer);
 	const size_t buffer_size = cx_buffer_size(&source->buffer);
 	rv = cx_buffer_init(&target->buffer);
 	if (rv < 0) {
 		goto out;
 	}
-	rv = cx_buffer_append(
-			&target->buffer, cx_buffer_data(&source->buffer),
-			cx_buffer_size(&source->buffer));
-	if (rv < 0) {
-		goto out;
+	if (buffer_size > 0) {
+		rv = cx_buffer_append(
+				&target->buffer, cx_buffer_data(&source->buffer),
+				cx_buffer_size(&source->buffer));
+		if (rv < 0) {
+			goto out;
+		}
 	}
-	buffer_data = cx_buffer_data(&target->buffer);
-	const uint8_t *iterator_data = target->iterator_impl->data(copied_iterator);
-	const size_t iterator_size = target->iterator_impl->size(copied_iterator);
+	const uint8_t *iterator_data = impl->data(copied_iterator);
+	const size_t iterator_size = impl->size(copied_iterator);
 	const uint8_t *data = source->data;
 
 	if (data == NULL) {
 		target->data = NULL;
 	} else if (data >= buffer_data && data < buffer_data + buffer_size) {
-		target->data = &buffer_data[data - buffer_data];
+		const uint8_t *target_buffer_data = cx_buffer_data(&target->buffer);
+		target->data = &target_buffer_data[data - buffer_data];
 	} else if (data >= iterator_data && data < iterator_data + iterator_size) {
 		target->data = &iterator_data[data - iterator_data];
 	} else {

libsqsh/include/sqsh_extract_private.h

@@ -213,7 +213,7 @@ SQSH_NO_EXPORT SQSH_NO_UNUSED int sqsh__extract_manager_init(
  */
 SQSH_NO_EXPORT int sqsh__extract_manager_uncompress(
 		struct SqshExtractManager *manager, const struct SqshMapReader *reader,
-		const struct CxBuffer **target);
+		struct CxBuffer **target);
 
 /**
  * @internal
@@ -226,7 +226,7 @@ SQSH_NO_EXPORT int sqsh__extract_manager_uncompress(
  * @return 0 on success, a negative value on error.
  */
 SQSH_NO_EXPORT int sqsh__extract_manager_retain_buffer(
-		struct SqshExtractManager *manager, const struct CxBuffer *buffer);
+		struct SqshExtractManager *manager, struct CxBuffer *buffer);
 
 /**
  * @internal
@@ -265,7 +265,7 @@ struct SqshExtractView {
 	 * @privatesection
 	 */
 	struct SqshExtractManager *manager;
-	const struct CxBuffer *buffer;
+	struct CxBuffer *buffer;
 	uint64_t address;
 	size_t size;
 };

libsqsh/include/sqsh_file_private.h

@@ -165,6 +165,19 @@ struct SqshFileIterator {
 SQSH_NO_EXPORT SQSH_NO_UNUSED int sqsh__file_iterator_init(
 		struct SqshFileIterator *iterator, const struct SqshFile *file);
 
+/**
+ * @internal
+ * @memberof SqshFileIterator
+ * @brief Creates a copy of a file iterator.
+ *
+ * @param[out] target The iterator to copy to.
+ * @param[in] source The iterator to copy from.
+ *
+ * @return 0 on success, less than 0 on error.
+ */
+SQSH_NO_EXPORT SQSH_NO_UNUSED int sqsh__file_iterator_copy(
+		struct SqshFileIterator *target, const struct SqshFileIterator *source);
+
 /**
  * @internal
  * @memberof SqshFileIterator

libsqsh/include/sqsh_mapper_private.h

@@ -231,6 +231,18 @@ SQSH_NO_EXPORT SQSH_NO_UNUSED int sqsh__map_manager_get(
 		struct SqshMapManager *manager, sqsh_index_t index,
 		const struct SqshMapSlice **target);
 
+/**
+ * @internal
+ * @memberof SqshMapManager
+ * @brief Retains a slice for a chunk.
+ *
+ * @param[in] manager The SqshMapManager instance.
+ * @param[in] mapping The mapping to retain.
+ * @return Returns 0 on success, a negative value on error.
+ */
+SQSH_NO_EXPORT SQSH_NO_UNUSED int sqsh__map_manager_retain(
+		struct SqshMapManager *manager, const struct SqshMapSlice *mapping);
+
 /**
  * @internal
  * @memberof SqshMapManager

libsqsh/src/extract/extract_manager.c

@@ -126,7 +126,7 @@ extract(struct SqshExtractManager *manager, const struct SqshMapReader *reader,
 int
 sqsh__extract_manager_uncompress(
 		struct SqshExtractManager *manager, const struct SqshMapReader *reader,
-		const struct CxBuffer **target) {
+		struct CxBuffer **target) {
 	int rv = 0;
 	bool locked = false;
 	struct CxBuffer *buffer = NULL;
@@ -174,8 +174,8 @@ sqsh__extract_manager_uncompress(
 
 int
 sqsh__extract_manager_retain_buffer(
-		struct SqshExtractManager *manager, const struct CxBuffer *buffer) {
-	cx_rc_radix_tree_retain_value(&manager->cache, (void *)buffer);
+		struct SqshExtractManager *manager, struct CxBuffer *buffer) {
+	cx_rc_radix_tree_retain_value(&manager->cache, buffer);
 	return 0;
 }
 

libsqsh/src/extract/extract_view.c

@@ -74,6 +74,7 @@ sqsh__extract_view_copy(
 	}
 	target->buffer = source->buffer;
 	target->size = source->size;
+	target->address = source->address;
 out:
 	if (rv < 0) {
 		sqsh__extract_view_cleanup(target);

libsqsh/src/file/fragment_view.c

@@ -163,6 +163,9 @@ sqsh__fragment_view_copy(
 		const struct SqshFragmentView *source) {
 	int rv = 0;
 	target->fragment_table = source->fragment_table;
+	if (target->fragment_table == NULL) {
+		goto out;
+	}
 	rv = sqsh__map_reader_copy(&target->map_reader, &source->map_reader);
 	if (rv < 0) {
 		goto out;

libsqsh/src/mapper/map_iterator.c

@@ -75,6 +75,7 @@ sqsh__map_iterator_copy(
 	target->map_manager = source->map_manager;
 	// TODO
 	// rv = sqsh__map_slice_copy(target->mapping, source->mapping);
+	rv = sqsh__map_manager_retain(target->map_manager, target->mapping);
 	if (rv < 0) {
 		goto out;
 	}

libsqsh/src/mapper/map_manager.c

@@ -167,9 +167,9 @@ sqsh__map_manager_get(
 }
 
 int
-sqsh__map_manager_retain_slice(
+sqsh__map_manager_retain(
 		struct SqshMapManager *manager, const struct SqshMapSlice *mapping) {
-	if (manager == NULL) {
+	if (manager == NULL || mapping == NULL) {
 		return 0;
 	}
 	int rv = sqsh__mutex_lock(&manager->lock);

test/libsqsh/extract/extract_manager.c

@@ -44,7 +44,7 @@ UTEST(directory_iterator, decompress) {
 	int rv;
 	struct SqshArchive archive = {0};
 	struct SqshExtractManager manager = {0};
-	const struct CxBuffer *buffer = NULL;
+	struct CxBuffer *buffer = NULL;
 	uint8_t payload[8192] = {SQSH_HEADER, ZLIB_ABCD};
 
 	mk_stub(&archive, payload, sizeof(payload));
@@ -78,8 +78,8 @@ UTEST(directory_iterator, decompress_and_cached) {
 	int rv;
 	struct SqshArchive archive = {0};
 	struct SqshExtractManager manager = {0};
-	const struct CxBuffer *buffer = NULL;
-	const struct CxBuffer *cached_buffer = NULL;
+	struct CxBuffer *buffer = NULL;
+	struct CxBuffer *cached_buffer = NULL;
 	uint8_t payload[8192] = {SQSH_HEADER, ZLIB_ABCD};
 
 	mk_stub(&archive, payload, sizeof(payload));

test/libsqsh/integration.c

@@ -223,7 +223,7 @@ UTEST(integration, sqsh_cat_fragment) {
 	size = sqsh_file_size(file);
 	ASSERT_EQ((size_t)2, size);
 
-	rv = sqsh_file_reader_advance(&reader, 0, size);
+	rv = sqsh_file_reader_advance2(&reader, 0, size);
 	ASSERT_EQ(0, rv);
 
 	data = sqsh_file_reader_data(&reader);
@@ -546,7 +546,7 @@ multithreaded_resolver(void *arg) {
 	} else {
 		struct SqshFileReader *reader = sqsh_file_reader_new(file, &rv);
 		size_t size = sqsh_file_size(file);
-		rv = sqsh_file_reader_advance(reader, 0, size);
+		rv = sqsh_file_reader_advance2(reader, 0, size);
 		assert(rv == 0);
 		sqsh_file_reader_free(reader);
 	}
@@ -804,4 +804,71 @@ UTEST(integration, mmap) {
 	ASSERT_EQ(0, rv);
 }
 
+UTEST(integration, copy_iterator_newly) {
+	int rv;
+	struct SqshArchive sqsh = {0};
+	struct SqshFile *file = NULL;
+	struct SqshFileIterator iter = {0};
+	struct SqshFileIterator copy_iter = {0};
+
+	struct SqshConfig config = DEFAULT_CONFIG(TEST_SQUASHFS_IMAGE_LEN);
+	config.archive_offset = 1010;
+	rv = sqsh__archive_init(&sqsh, (char *)TEST_SQUASHFS_IMAGE, &config);
+	ASSERT_EQ(0, rv);
+
+	file = sqsh_open(&sqsh, "/b", &rv);
+	ASSERT_EQ(0, rv);
+
+	rv = sqsh__file_iterator_init(&iter, file);
+	ASSERT_EQ(0, rv);
+
+	rv = sqsh__file_iterator_copy(&copy_iter, &iter);
+	ASSERT_EQ(0, rv);
+
+	rv = sqsh_close(file);
+	ASSERT_EQ(0, rv);
+
+	rv = sqsh__archive_cleanup(&sqsh);
+	ASSERT_EQ(0, rv);
+}
+
+UTEST(integration, copy_iterator_iterated) {
+	int rv;
+	struct SqshArchive sqsh = {0};
+	struct SqshFile *file = NULL;
+	struct SqshFileIterator iter = {0};
+	struct SqshFileIterator copy_iter = {0};
+
+	struct SqshConfig config = DEFAULT_CONFIG(TEST_SQUASHFS_IMAGE_LEN);
+	config.archive_offset = 1010;
+	rv = sqsh__archive_init(&sqsh, (char *)TEST_SQUASHFS_IMAGE, &config);
+	ASSERT_EQ(0, rv);
+
+	file = sqsh_open(&sqsh, "/b", &rv);
+	ASSERT_EQ(0, rv);
+
+	rv = sqsh__file_iterator_init(&iter, file);
+	ASSERT_EQ(0, rv);
+
+	bool has_next = sqsh_file_iterator_next(&iter, 1, &rv);
+	ASSERT_LE(0, rv);
+	ASSERT_TRUE(has_next);
+	rv = 0;
+
+	rv = sqsh__file_iterator_copy(&copy_iter, &iter);
+	ASSERT_EQ(0, rv);
+
+	rv = sqsh__file_iterator_cleanup(&iter);
+	ASSERT_EQ(0, rv);
+
+	rv = sqsh__file_iterator_cleanup(&copy_iter);
+	ASSERT_EQ(0, rv);
+
+	rv = sqsh_close(file);
+	ASSERT_EQ(0, rv);
+
+	rv = sqsh__archive_cleanup(&sqsh);
+	ASSERT_EQ(0, rv);
+}
+
 UTEST_MAIN()