8 files changed, 18 insertions, 564 deletions

diff --git a/lib/io/Makemodule.am b/lib/io/Makemodule.am
index c2d1a15..d342063 100644
--- a/lib/io/Makemodule.am
+++ b/lib/io/Makemodule.am
@@ -6,13 +6,6 @@ libio_a_SOURCES = include/io/xfrm.h include/io/std.h \
 libio_a_CFLAGS = $(AM_CFLAGS) $(ZLIB_CFLAGS) $(XZ_CFLAGS)
 libio_a_CFLAGS += $(ZSTD_CFLAGS) $(BZIP2_CFLAGS)
 
-if WINDOWS
-libio_a_SOURCES += lib/io/src/win32/dir_iterator.c
-libio_a_CFLAGS += -DWINVER=0x0600 -D_WIN32_WINNT=0x0600
-else
-libio_a_SOURCES += lib/io/src/unix/dir_iterator.c
-endif
-
 noinst_LIBRARIES += libio.a
 
 LIBIO_TESTS = test_istream_mem test_dir_iterator \
diff --git a/lib/io/src/dir_tree_iterator.c b/lib/io/src/dir_tree_iterator.c
index 6370743..0ec478c 100644
--- a/lib/io/src/dir_tree_iterator.c
+++ b/lib/io/src/dir_tree_iterator.c
@@ -8,6 +8,7 @@
 #include "io/dir_iterator.h"
 #include "util/util.h"
 #include "sqfs/error.h"
+#include "sqfs/io.h"
 
 #include <stdlib.h>
 #include <string.h>
@@ -311,9 +312,11 @@ sqfs_dir_iterator_t *dir_tree_iterator_create(const char *path,
 
 	it->cfg = *cfg;
 
-	dir = dir_iterator_create(path);
-	if (dir == NULL)
+	ret = sqfs_dir_iterator_create_native(&dir, path, 0);
+	if (ret) {
+		perror(path);
 		goto fail;
+	}
 
 	ret = push(it, "", dir);
 	dir = sqfs_drop(dir);
diff --git a/lib/io/src/unix/dir_iterator.c b/lib/io/src/unix/dir_iterator.c
deleted file mode 100644
index 74ac953..0000000
--- a/lib/io/src/unix/dir_iterator.c
+++ /dev/null
@@ -1,241 +0,0 @@
-/* SPDX-License-Identifier: LGPL-3.0-or-later */
-/*
- * dir_iterator.c
- *
- * Copyright (C) 2023 David Oberhollenzer <goliath@infraroot.at>
- */
-#include "config.h"
-#include "io/dir_iterator.h"
-#include "util/util.h"
-#include "sqfs/error.h"
-#include "sqfs/io.h"
-
-#include <sys/stat.h>
-#include <stdlib.h>
-#include <dirent.h>
-#include <string.h>
-#include <errno.h>
-
-typedef struct {
-	sqfs_dir_iterator_t base;
-
-	struct dirent *ent;
-	struct stat sb;
-	dev_t device;
-	int state;
-	DIR *dir;
-} unix_dir_iterator_t;
-
-static void dir_destroy(sqfs_object_t *obj)
-{
-	unix_dir_iterator_t *it = (unix_dir_iterator_t *)obj;
-
-	closedir(it->dir);
-	free(it);
-}
-
-static int dir_read_link(sqfs_dir_iterator_t *base, char **out)
-{
-	unix_dir_iterator_t *it = (unix_dir_iterator_t *)base;
-	ssize_t ret;
-	size_t size;
-	char *str;
-
-	*out = NULL;
-
-	if (it->state < 0)
-		return it->state;
-
-	if (it->state > 0 || it->ent == NULL)
-		return SQFS_ERROR_NO_ENTRY;
-
-	if ((sizeof(it->sb.st_size) > sizeof(size_t)) &&
-	    it->sb.st_size > SIZE_MAX) {
-		return SQFS_ERROR_ALLOC;
-	}
-
-	if (SZ_ADD_OV((size_t)it->sb.st_size, 1, &size))
-		return SQFS_ERROR_ALLOC;
-
-	str = calloc(1, size);
-	if (str == NULL)
-		return SQFS_ERROR_ALLOC;
-
-	ret = readlinkat(dirfd(it->dir), it->ent->d_name,
-			 str, (size_t)it->sb.st_size);
-	if (ret < 0) {
-		free(str);
-		return SQFS_ERROR_IO;
-	}
-
-	str[ret] = '\0';
-
-	*out = str;
-	return 0;
-}
-
-static int dir_next(sqfs_dir_iterator_t *base, sqfs_dir_entry_t **out)
-{
-	unix_dir_iterator_t *it = (unix_dir_iterator_t *)base;
-
-	*out = NULL;
-	if (it->state != 0)
-		return it->state;
-
-	errno = 0;
-	it->ent = readdir(it->dir);
-
-	if (it->ent == NULL) {
-		if (errno != 0) {
-			it->state = SQFS_ERROR_IO;
-		} else {
-			it->state = 1;
-		}
-
-		return it->state;
-	}
-
-	if (fstatat(dirfd(it->dir), it->ent->d_name,
-		    &it->sb, AT_SYMLINK_NOFOLLOW)) {
-		it->state = SQFS_ERROR_IO;
-		return it->state;
-	}
-
-	*out = sqfs_dir_entry_create(it->ent->d_name, it->sb.st_mode, 0);
-	if ((*out) == NULL) {
-		it->state = SQFS_ERROR_ALLOC;
-		return it->state;
-	}
-
-	(*out)->mtime = it->sb.st_mtime;
-	(*out)->dev = it->sb.st_dev;
-	(*out)->rdev = it->sb.st_rdev;
-	(*out)->uid = it->sb.st_uid;
-	(*out)->gid = it->sb.st_gid;
-
-	if (S_ISREG(it->sb.st_mode))
-		(*out)->size = it->sb.st_size;
-
-	if ((*out)->dev != it->device)
-		(*out)->flags |= SQFS_DIR_ENTRY_FLAG_MOUNT_POINT;
-
-	return it->state;
-}
-
-static void dir_ignore_subdir(sqfs_dir_iterator_t *it)
-{
-	(void)it;
-}
-
-static int dir_open_file_ro(sqfs_dir_iterator_t *base, sqfs_istream_t **out)
-{
-	unix_dir_iterator_t *it = (unix_dir_iterator_t *)base;
-	int fd, ret;
-
-	*out = NULL;
-	if (it->state < 0)
-		return it->state;
-
-	if (it->state > 0 || it->ent == NULL)
-		return SQFS_ERROR_NO_ENTRY;
-
-	fd = openat(dirfd(it->dir), it->ent->d_name, O_RDONLY);
-	if (fd < 0)
-		return SQFS_ERROR_IO;
-
-	ret = sqfs_istream_open_handle(out, it->ent->d_name,
-				       fd, SQFS_FILE_OPEN_READ_ONLY);
-	if (ret != 0) {
-		int err = errno;
-		close(fd);
-		errno = err;
-	}
-	return ret;
-}
-
-static int dir_read_xattr(sqfs_dir_iterator_t *it, sqfs_xattr_t **out)
-{
-	(void)it;
-	*out = NULL;
-	return 0;
-}
-
-static int create_iterator(sqfs_dir_iterator_t **out, DIR *dir);
-
-static int dir_open_subdir(sqfs_dir_iterator_t *base, sqfs_dir_iterator_t **out)
-{
-	const unix_dir_iterator_t *it = (const unix_dir_iterator_t *)base;
-	DIR *dir;
-	int fd;
-
-	*out = NULL;
-
-	if (it->state < 0)
-		return it->state;
-
-	if (it->state > 0 || it->ent == NULL)
-		return SQFS_ERROR_NO_ENTRY;
-
-	fd = openat(dirfd(it->dir), it->ent->d_name, O_RDONLY | O_DIRECTORY);
-	if (fd < 0) {
-		if (errno == ENOTDIR)
-			return SQFS_ERROR_NOT_DIR;
-		return SQFS_ERROR_IO;
-	}
-
-	dir = fdopendir(fd);
-	if (dir == NULL) {
-		int err = errno;
-		close(fd);
-		errno = err;
-		return SQFS_ERROR_IO;
-	}
-
-	return create_iterator(out, dir);
-}
-
-static int create_iterator(sqfs_dir_iterator_t **out, DIR *dir)
-{
-	unix_dir_iterator_t *it = calloc(1, sizeof(*it));
-
-	if (it == NULL) {
-		closedir(dir);
-		return SQFS_ERROR_ALLOC;
-	}
-
-	it->dir = dir;
-
-	if (fstat(dirfd(dir), &it->sb)) {
-		int err = errno;
-		closedir(dir);
-		free(it);
-		errno = err;
-		return SQFS_ERROR_IO;
-	}
-
-	sqfs_object_init(it, dir_destroy, NULL);
-	it->device = it->sb.st_dev;
-	((sqfs_dir_iterator_t *)it)->next = dir_next;
-	((sqfs_dir_iterator_t *)it)->read_link = dir_read_link;
-	((sqfs_dir_iterator_t *)it)->open_subdir = dir_open_subdir;
-	((sqfs_dir_iterator_t *)it)->ignore_subdir = dir_ignore_subdir;
-	((sqfs_dir_iterator_t *)it)->open_file_ro = dir_open_file_ro;
-	((sqfs_dir_iterator_t *)it)->read_xattr = dir_read_xattr;
-
-	*out = (sqfs_dir_iterator_t *)it;
-	return 0;
-}
-
-sqfs_dir_iterator_t *dir_iterator_create(const char *path)
-{
-	sqfs_dir_iterator_t *out;
-	DIR *dir;
-
-	dir = opendir(path);
-	if (dir == NULL || create_iterator(&out, dir) != 0) {
-		perror(path);
-		return NULL;
-	}
-
-	return out;
-}
diff --git a/lib/io/src/win32/dir_iterator.c b/lib/io/src/win32/dir_iterator.c
deleted file mode 100644
index 15cfbc5..0000000
--- a/lib/io/src/win32/dir_iterator.c
+++ /dev/null
@@ -1,309 +0,0 @@
-/* SPDX-License-Identifier: LGPL-3.0-or-later */
-/*
- * dir_iterator.c
- *
- * Copyright (C) 2023 David Oberhollenzer <goliath@infraroot.at>
- */
-#include "config.h"
-#include "io/dir_iterator.h"
-#include "util/util.h"
-#include "sqfs/error.h"
-#include "sqfs/io.h"
-
-#include <windows.h>
-#include <stdlib.h>
-#include <stdio.h>
-
-#define UNIX_EPOCH_ON_W32 11644473600UL
-#define W32_TICS_PER_SEC 10000000UL
-
-typedef struct {
-	sqfs_dir_iterator_t base;
-
-	WIN32_FIND_DATAW ent;
-	HANDLE dirhnd;
-	int state;
-	bool is_first;
-
-	WCHAR path[];
-} dir_iterator_win32_t;
-
-static sqfs_s64 w32time_to_unix(const FILETIME *ft)
-{
-	sqfs_u64 w32ts;
-
-	w32ts = ft->dwHighDateTime;
-	w32ts <<= 32UL;
-	w32ts |= ft->dwLowDateTime;
-
-	w32ts /= W32_TICS_PER_SEC;
-
-	if (w32ts <= UNIX_EPOCH_ON_W32)
-		return -((sqfs_s64)(UNIX_EPOCH_ON_W32 - w32ts));
-
-	return w32ts - UNIX_EPOCH_ON_W32;
-}
-
-static int dir_iterator_read_link(sqfs_dir_iterator_t *it, char **out)
-{
-	(void)it;
-	*out = NULL;
-	return SQFS_ERROR_UNSUPPORTED;
-}
-
-static int dir_iterator_next(sqfs_dir_iterator_t *it, sqfs_dir_entry_t **out)
-{
-	dir_iterator_win32_t *w32 = (dir_iterator_win32_t *)it;
-	sqfs_dir_entry_t *ent = NULL;
-	DWORD length;
-
-	if (w32->state == 0 && !w32->is_first) {
-		if (!FindNextFileW(w32->dirhnd, &w32->ent)) {
-			os_error_t err = get_os_error_state();
-
-			if (err.w32_errno == ERROR_NO_MORE_FILES) {
-				w32->state = 1;
-			} else {
-				w32->state = SQFS_ERROR_IO;
-			}
-
-			set_os_error_state(err);
-		}
-	}
-
-	w32->is_first = false;
-
-	if (w32->state != 0)
-		goto out;
-
-	length = WideCharToMultiByte(CP_UTF8, 0, w32->ent.cFileName,
-				     -1, NULL, 0, NULL, NULL);
-	if (length <= 0) {
-		w32->state = SQFS_ERROR_ALLOC;
-		goto out;
-	}
-
-	ent = alloc_flex(sizeof(*ent), 1, length + 1);
-	if (ent == NULL) {
-		w32->state = SQFS_ERROR_ALLOC;
-		goto out;
-	}
-
-	WideCharToMultiByte(CP_UTF8, 0, w32->ent.cFileName, -1,
-			    ent->name, length + 1, NULL, NULL);
-
-	if (w32->ent.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) {
-		ent->mode = S_IFDIR | 0755;
-	} else {
-		ent->mode = S_IFREG | 0644;
-		ent->size = w32->ent.nFileSizeHigh;
-		ent->size <<= 32UL;
-		ent->size |= w32->ent.nFileSizeLow;
-	}
-
-	ent->mtime = w32time_to_unix(&(w32->ent.ftLastWriteTime));
-out:
-	*out = ent;
-	return w32->state;
-}
-
-static void dir_iterator_destroy(sqfs_object_t *obj)
-{
-	dir_iterator_win32_t *dir = (dir_iterator_win32_t *)obj;
-
-	FindClose(dir->dirhnd);
-	free(dir);
-}
-
-static void dir_iterator_ignore_subdir(sqfs_dir_iterator_t *it)
-{
-	(void)it;
-}
-
-static int dir_iterator_open_file_ro(sqfs_dir_iterator_t *it,
-				     sqfs_istream_t **out)
-{
-	dir_iterator_win32_t *dir = (dir_iterator_win32_t *)it;
-	size_t plen, slen;
-	os_error_t err;
-	WCHAR *str16;
-	DWORD length;
-	HANDLE hnd;
-	char *str8;
-	int ret;
-
-	*out = NULL;
-
-	if (dir->state != 0)
-		return (dir->state > 0) ? SQFS_ERROR_NO_ENTRY : dir->state;
-
-	plen = wcslen(dir->path) - 1;
-	slen = wcslen(dir->ent.cFileName);
-
-	str16 = calloc(plen + slen + 1, sizeof(WCHAR));
-	if (str16 == NULL)
-		return SQFS_ERROR_ALLOC;
-
-	memcpy(str16,        dir->path,          plen * sizeof(WCHAR));
-	memcpy(str16 + plen, dir->ent.cFileName, slen * sizeof(WCHAR));
-
-	hnd = CreateFileW(str16, GENERIC_READ, FILE_SHARE_READ, NULL,
-			  OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL,
-			  NULL);
-
-	err = get_os_error_state();
-	free(str16);
-	set_os_error_state(err);
-
-	if (hnd == INVALID_HANDLE_VALUE)
-		return SQFS_ERROR_IO;
-
-	length = WideCharToMultiByte(CP_UTF8, 0, dir->ent.cFileName,
-				     -1, NULL, 0, NULL, NULL);
-	if (length <= 0) {
-		CloseHandle(hnd);
-		return SQFS_ERROR_ALLOC;
-	}
-
-	str8 = calloc(1, length + 1);
-	if (str8 == NULL) {
-		CloseHandle(hnd);
-		return SQFS_ERROR_ALLOC;
-	}
-
-	WideCharToMultiByte(CP_UTF8, 0, dir->ent.cFileName, -1, str8,
-			    length + 1, NULL, NULL);
-
-	ret = sqfs_istream_open_handle(out, str8, hnd,
-				       SQFS_FILE_OPEN_READ_ONLY);
-	err = get_os_error_state();
-	free(str8);
-	if (ret != 0)
-		CloseHandle(hnd);
-	set_os_error_state(err);
-
-	return ret;
-}
-
-static int dir_iterator_read_xattr(sqfs_dir_iterator_t *it, sqfs_xattr_t **out)
-{
-	(void)it;
-	*out = NULL;
-	return 0;
-}
-
-static int dir_iterator_init(dir_iterator_win32_t *it);
-
-static int dir_iterator_open_subdir(sqfs_dir_iterator_t *it,
-				    sqfs_dir_iterator_t **out)
-{
-	const dir_iterator_win32_t *dir = (const dir_iterator_win32_t *)it;
-	dir_iterator_win32_t *sub = NULL;
-	size_t plen, slen, total;
-	int ret;
-
-	*out = NULL;
-
-	if (dir->state != 0)
-		return (dir->state > 0) ? SQFS_ERROR_NO_ENTRY : dir->state;
-
-	if (!(dir->ent.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY))
-		return SQFS_ERROR_NOT_DIR;
-
-	plen = wcslen(dir->path) - 1;
-	slen = wcslen(dir->ent.cFileName);
-	total = plen + slen + 3;
-
-	sub = alloc_flex(sizeof(*sub), sizeof(WCHAR), total);
-	if (sub == NULL)
-		return SQFS_ERROR_ALLOC;
-
-	memcpy(sub->path, dir->path, plen * sizeof(WCHAR));
-	memcpy(sub->path + plen, dir->ent.cFileName, slen * sizeof(WCHAR));
-	sub->path[plen + slen    ] = '\\';
-	sub->path[plen + slen + 1] = '*';
-	sub->path[plen + slen + 2] = '\0';
-
-	ret = dir_iterator_init(sub);
-	if (ret != 0) {
-		free(sub);
-		sub = NULL;
-	}
-
-	*out = (sqfs_dir_iterator_t *)sub;
-	return ret;
-}
-
-static int dir_iterator_init(dir_iterator_win32_t *it)
-{
-	sqfs_object_init(it, dir_iterator_destroy, NULL);
-
-	((sqfs_dir_iterator_t *)it)->next = dir_iterator_next;
-	((sqfs_dir_iterator_t *)it)->read_link = dir_iterator_read_link;
-	((sqfs_dir_iterator_t *)it)->open_subdir = dir_iterator_open_subdir;
-	((sqfs_dir_iterator_t *)it)->ignore_subdir = dir_iterator_ignore_subdir;
-	((sqfs_dir_iterator_t *)it)->open_file_ro = dir_iterator_open_file_ro;
-	((sqfs_dir_iterator_t *)it)->read_xattr = dir_iterator_read_xattr;
-	it->is_first = true;
-	it->state = 0;
-
-	it->dirhnd = FindFirstFileW(it->path, &it->ent);
-	if (it->dirhnd == INVALID_HANDLE_VALUE)
-		return SQFS_ERROR_IO;
-
-	return 0;
-}
-
-sqfs_dir_iterator_t *dir_iterator_create(const char *path)
-{
-	dir_iterator_win32_t *it;
-	size_t len, newlen;
-	WCHAR *wpath = NULL;
-	void *new = NULL;
-
-	/* convert path to UTF-16, append "\\*" */
-	wpath = path_to_windows(path);
-	if (wpath == NULL)
-		goto fail_alloc;
-
-	len = wcslen(wpath);
-	newlen = len + 1;
-
-	if (len > 0 && wpath[len - 1] != '\\')
-		newlen += 1;
-
-	new = realloc(wpath, sizeof(wpath[0]) * (newlen + 1));
-	if (new == NULL)
-		goto fail_alloc;
-
-	wpath = new;
-
-	if (len > 0 && wpath[len - 1] != '\\')
-		wpath[len++] = '\\';
-
-	wpath[len++] = '*';
-	wpath[len++] = '\0';
-
-	/* create the sourrounding iterator structure */
-	new = realloc(wpath, sizeof(*it) + len * sizeof(wpath[0]));
-	if (new == NULL)
-		goto fail_alloc;
-
-	it = new;
-	wpath = NULL;
-	memmove(it->path, new, len * sizeof(wpath[0]));
-
-	/* initialize */
-	memset(it, 0, offsetof(dir_iterator_win32_t, path));
-	if (dir_iterator_init(it) != 0) {
-		w32_perror(path);
-		free(it);
-		it = NULL;
-	}
-
-	return (sqfs_dir_iterator_t *)it;
-fail_alloc:
-	fprintf(stderr, "%s: allocation failure.\n", path);
-	free(wpath);
-	return NULL;
-}
diff --git a/lib/io/test/dir_iterator.c b/lib/io/test/dir_iterator.c
index 013e41e..56610b6 100644
--- a/lib/io/test/dir_iterator.c
+++ b/lib/io/test/dir_iterator.c
@@ -40,7 +40,8 @@ int main(int argc, char **argv)
 	(void)argc; (void)argv;
 
 	/* scan the top level hierarchy */
-	dir = dir_iterator_create(TEST_PATH);
+	ret = sqfs_dir_iterator_create_native(&dir, TEST_PATH, 0);
+	TEST_EQUAL_I(ret, 0);
 	TEST_NOT_NULL(dir);
 
 	ret = dir->next(dir, &ent[0]);
@@ -86,7 +87,8 @@ int main(int argc, char **argv)
 		free(ent[i]);
 
 	/* scan first sub hierarchy */
-	dir = dir_iterator_create(TEST_PATH "/dira");
+	ret = sqfs_dir_iterator_create_native(&dir, TEST_PATH "/dira", 0);
+	TEST_EQUAL_I(ret, 0);
 	TEST_NOT_NULL(dir);
 
 	ret = dir->next(dir, &ent[0]);
@@ -132,7 +134,8 @@ int main(int argc, char **argv)
 		free(ent[i]);
 
 	/* scan second sub hierarchy */
-	dir = dir_iterator_create(TEST_PATH "/dirb");
+	ret = sqfs_dir_iterator_create_native(&dir, TEST_PATH "/dirb", 0);
+	TEST_EQUAL_I(ret, 0);
 	TEST_NOT_NULL(dir);
 
 	ret = dir->next(dir, &ent[0]);
@@ -184,7 +187,8 @@ int main(int argc, char **argv)
 		free(ent[i]);
 
 	/* scan first sub hierarchy */
-	dir = dir_iterator_create(TEST_PATH "/dirc");
+	ret = sqfs_dir_iterator_create_native(&dir, TEST_PATH "/dirc", 0);
+	TEST_EQUAL_I(ret, 0);
 	TEST_NOT_NULL(dir);
 
 	ret = dir->next(dir, &ent[0]);
@@ -234,7 +238,8 @@ int main(int argc, char **argv)
 	subb = NULL;
 	subc = NULL;
 
-	dir = dir_iterator_create(TEST_PATH);
+	ret = sqfs_dir_iterator_create_native(&dir, TEST_PATH, 0);
+	TEST_EQUAL_I(ret, 0);
 	TEST_NOT_NULL(dir);
 
 	for (i = 0; i < 5; ++i) {
diff --git a/lib/io/test/dir_tree_iterator.c b/lib/io/test/dir_tree_iterator.c
index 8e11e2a..a6e7fcb 100644
--- a/lib/io/test/dir_tree_iterator.c
+++ b/lib/io/test/dir_tree_iterator.c
@@ -9,6 +9,7 @@
 #include "io/dir_iterator.h"
 #include "sqfs/error.h"
 #include "util/test.h"
+#include "sqfs/io.h"
 #include "compat.h"
 
 static int compare_entries(const void *a, const void *b)
diff --git a/lib/io/test/dir_tree_iterator2.c b/lib/io/test/dir_tree_iterator2.c
index 2833dc5..0ffb86e 100644
--- a/lib/io/test/dir_tree_iterator2.c
+++ b/lib/io/test/dir_tree_iterator2.c
@@ -9,6 +9,7 @@
 #include "io/dir_iterator.h"
 #include "sqfs/error.h"
 #include "util/test.h"
+#include "sqfs/io.h"
 #include "compat.h"
 
 static int compare_entries(const void *a, const void *b)
diff --git a/lib/io/test/dir_tree_iterator3.c b/lib/io/test/dir_tree_iterator3.c
index b82934f..4ac947c 100644
--- a/lib/io/test/dir_tree_iterator3.c
+++ b/lib/io/test/dir_tree_iterator3.c
@@ -9,6 +9,7 @@
 #include "io/dir_iterator.h"
 #include "sqfs/error.h"
 #include "util/test.h"
+#include "sqfs/io.h"
 #include "compat.h"
 
 static int compare_entries(const void *a, const void *b)