libsquashfs: merge windows & unix file I/O primitives

By adding additional close/duplicate primitives, the remaining, mostly
identical istream/ostream/file code is mostly identical between Windows
and Unix and be merged, mostly without stitches.

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

1 files changed, 0 insertions, 222 deletions

diff --git a/lib/sqfs/src/unix/io_file.c b/lib/sqfs/src/unix/io_file.c
deleted file mode 100644
index f9b602a..0000000
--- a/lib/sqfs/src/unix/io_file.c
+++ /dev/null
@@ -1,222 +0,0 @@
-/* SPDX-License-Identifier: LGPL-3.0-or-later */
-/*
- * io_file.c
- *
- * Copyright (C) 2019 David Oberhollenzer <goliath@infraroot.at>
- */
-#define SQFS_BUILDING_DLL
-#include "config.h"
-
-#include "sqfs/io.h"
-#include "sqfs/error.h"
-#include "compat.h"
-
-#include <sys/stat.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#include <errno.h>
-#include <fcntl.h>
-
-
-typedef struct {
-	sqfs_file_t base;
-
-	bool readonly;
-	sqfs_u64 size;
-	sqfs_file_handle_t fd;
-
-	char name[];
-} sqfs_file_stdio_t;
-
-
-static void stdio_destroy(sqfs_object_t *base)
-{
-	sqfs_file_stdio_t *file = (sqfs_file_stdio_t *)base;
-
-	close(file->fd);
-	free(file);
-}
-
-static sqfs_object_t *stdio_copy(const sqfs_object_t *base)
-{
-	const sqfs_file_stdio_t *file = (const sqfs_file_stdio_t *)base;
-	sqfs_file_stdio_t *copy;
-	size_t size;
-	int err;
-
-	if (!file->readonly) {
-		errno = ENOTSUP;
-		return NULL;
-	}
-
-	size = sizeof(*file) + strlen(file->name) + 1;
-	copy = calloc(1, size);
-	if (copy == NULL)
-		return NULL;
-
-	memcpy(copy, file, size);
-
-	copy->fd = dup(file->fd);
-	if (copy->fd < 0) {
-		err = errno;
-		free(copy);
-		copy = NULL;
-		errno = err;
-	}
-
-	return (sqfs_object_t *)copy;
-}
-
-static int stdio_read_at(sqfs_file_t *base, sqfs_u64 offset,
-			 void *buffer, size_t size)
-{
-	sqfs_file_stdio_t *file = (sqfs_file_stdio_t *)base;
-	ssize_t ret;
-
-	while (size > 0) {
-		ret = pread(file->fd, buffer, size, offset);
-
-		if (ret < 0) {
-			if (errno == EINTR)
-				continue;
-			return SQFS_ERROR_IO;
-		}
-
-		if (ret == 0)
-			return SQFS_ERROR_OUT_OF_BOUNDS;
-
-		buffer = (char *)buffer + ret;
-		size -= ret;
-		offset += ret;
-	}
-
-	return 0;
-}
-
-static int stdio_write_at(sqfs_file_t *base, sqfs_u64 offset,
-			  const void *buffer, size_t size)
-{
-	sqfs_file_stdio_t *file = (sqfs_file_stdio_t *)base;
-	ssize_t ret;
-
-	while (size > 0) {
-		ret = pwrite(file->fd, buffer, size, offset);
-
-		if (ret < 0) {
-			if (errno == EINTR)
-				continue;
-			return SQFS_ERROR_IO;
-		}
-
-		if (ret == 0)
-			return SQFS_ERROR_OUT_OF_BOUNDS;
-
-		buffer = (const char *)buffer + ret;
-		size -= ret;
-		offset += ret;
-	}
-
-	if (offset >= file->size)
-		file->size = offset;
-
-	return 0;
-}
-
-static sqfs_u64 stdio_get_size(const sqfs_file_t *base)
-{
-	const sqfs_file_stdio_t *file = (const sqfs_file_stdio_t *)base;
-
-	return file->size;
-}
-
-static int stdio_truncate(sqfs_file_t *base, sqfs_u64 size)
-{
-	sqfs_file_stdio_t *file = (sqfs_file_stdio_t *)base;
-
-	if (ftruncate(file->fd, size))
-		return SQFS_ERROR_IO;
-
-	file->size = size;
-	return 0;
-}
-
-static const char *stdio_get_filename(sqfs_file_t *file)
-{
-	return ((sqfs_file_stdio_t *)file)->name;
-}
-
-int sqfs_open_native_file(sqfs_file_handle_t *out, const char *filename,
-			  sqfs_u32 flags)
-{
-	int open_mode;
-
-	*out = -1;
-
-	if (flags & ~SQFS_FILE_OPEN_ALL_FLAGS)
-		return SQFS_ERROR_UNSUPPORTED;
-
-	if (flags & SQFS_FILE_OPEN_READ_ONLY) {
-		open_mode = O_RDONLY;
-	} else {
-		open_mode = O_CREAT | O_RDWR;
-
-		if (flags & SQFS_FILE_OPEN_OVERWRITE) {
-			open_mode |= O_TRUNC;
-		} else {
-			open_mode |= O_EXCL;
-		}
-	}
-
-	*out = open(filename, open_mode, 0644);
-
-	return (*out < 0) ? SQFS_ERROR_IO : 0;
-}
-
-sqfs_file_t *sqfs_open_file(const char *filename, sqfs_u32 flags)
-{
-	sqfs_file_stdio_t *file;
-	size_t size, namelen;
-	sqfs_file_t *base;
-	struct stat sb;
-	int temp;
-
-	namelen = strlen(filename);
-	size = sizeof(*file) + 1;
-
-	if (SZ_ADD_OV(size, namelen, &size)) {
-		errno = EOVERFLOW;
-		return NULL;
-	}
-
-	file = calloc(1, size);
-	base = (sqfs_file_t *)file;
-	if (file == NULL)
-		return NULL;
-
-	sqfs_object_init(file, stdio_destroy, stdio_copy);
-	memcpy(file->name, filename, namelen);
-
-	if (sqfs_open_native_file(&file->fd, filename, flags))
-		goto fail;
-
-	if (fstat(file->fd, &sb))
-		goto fail;
-
-	file->size = sb.st_size;
-	file->readonly = (flags & SQFS_FILE_OPEN_READ_ONLY) != 0;
-
-	base->read_at = stdio_read_at;
-	base->write_at = stdio_write_at;
-	base->get_size = stdio_get_size;
-	base->truncate = stdio_truncate;
-	base->get_filename = stdio_get_filename;
-	return base;
-fail:
-	temp = errno;
-	if (file->fd >= 0)
-		close(file->fd);
-	free(file);
-	errno = temp;
-	return NULL;
-}