Rename src/ to opkg-opk/

4 files changed, 0 insertions, 1286 deletions

diff --git a/src/opk/local.mk b/src/opk/local.mk
deleted file mode 100644
index 9335153..0000000
--- a/src/opk/local.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-src_opkg_opk_SOURCES += \
-	%reldir%/opk.h \
-	%reldir%/read.c \
-	%reldir%/write.c
diff --git a/src/opk/opk.h b/src/opk/opk.h
deleted file mode 100644
index 93f9dfe..0000000
--- a/src/opk/opk.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright (C) 2023  Patrick McDermott
- *
- * This file is part of opkg-opk.
- *
- * opkg-opk is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * opkg-opk is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with opkg-opk.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-#ifndef OPKG_OPK_OPK_OPK_H_
-#define OPKG_OPK_OPK_OPK_H_
-
-#include <stdio.h>
-#include "../gzip.h"
-#include "../opk.h"
-#include "../ustar.h"
-
-struct _opkg_opk_opk_seek_name {
-	const char                     *name;
-	struct _opkg_opk_opk_seek_name *prev;
-	struct _opkg_opk_opk_seek_name *next;
-};
-
-struct opkg_opk_opk {
-	struct _opkg_opk_opk_seek_name *print_control_head;
-	struct _opkg_opk_opk_seek_name *print_control_tail;
-	struct _opkg_opk_opk_seek_name *print_data_head;
-	struct _opkg_opk_opk_seek_name *print_data_tail;
-	int                             list_control;
-	int                             list_data;
-	const char                     *control_dir;
-	size_t                          control_dir_len;
-	const char                     *data_dir;
-	size_t                          data_dir_len;
-	FILE                           *file;
-	struct opkg_opk_specials       *specials;
-	char                            file_buffer[8192];
-	uint64_t                        mtime;
-	const char                     *file_name;
-	char                           *outer_uname;
-	char                           *outer_gname;
-	struct opkg_opk_gzip           *outer_gzip;
-	struct opkg_opk_ustar          *outer_ustar;
-	struct opkg_opk_gzip           *inner_gzip;
-	struct opkg_opk_ustar          *inner_ustar;
-	int                             previously_printed;
-	char                           *path_real;
-	char                           *path_virt;
-	char                           *temp_file_name;
-};
-
-#endif  /* OPKG_OPK_OPK_OPK_H_ */
diff --git a/src/opk/read.c b/src/opk/read.c
deleted file mode 100644
index 21fbc66..0000000
--- a/src/opk/read.c
+++ /dev/null
@@ -1,669 +0,0 @@
-/*
- * Copyright (C) 2023  Patrick McDermott
- *
- * This file is part of opkg-opk.
- *
- * opkg-opk is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * opkg-opk is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with opkg-opk.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/stat.h>
-#include <time.h>
-#include "../defs.h"
-#include "../gzip.h"
-#include "../i18n.h"
-#include "../opk.h"
-#include "../ustar.h"
-#include "opk.h"
-
-static int
-_opkg_opk_opk_read_file(void *user_data, char **buffer, size_t *size)
-{
-	struct opkg_opk_opk *opk = user_data;
-
-	*buffer = opk->file_buffer;
-	*size   = fread(opk->file_buffer, 1, sizeof(opk->file_buffer),
-			opk->file);
-	if (feof(opk->file)) {
-		return OPKG_OPK_END;
-	} else if (ferror(opk->file) || *size == 0) {
-		return OPKG_OPK_ERROR;
-	} else {
-		return OPKG_OPK_OK;
-	}
-}
-
-static int
-_opkg_opk_opk_read_init_inner(struct opkg_opk_opk *opk)
-{
-	/* Initialize inner gzip decompressor. */
-	opk->inner_gzip = opkg_opk_gzip_init_read(
-			(opkg_opk_gzip_read_func *) &opkg_opk_ustar_read,
-			opk->outer_ustar);
-	if (opk->inner_gzip == NULL) {
-		fputs(_("Error: Failed to initialize\n"), stderr);
-		return OPKG_OPK_ERROR;
-	}
-
-	/* Initialize inner ustar unarchiver. */
-	opk->inner_ustar = opkg_opk_ustar_init(opk->inner_gzip);
-	if (opk->inner_ustar == NULL) {
-		fputs(_("Error: Failed to initialize\n"), stderr);
-		opkg_opk_gzip_free(opk->inner_gzip);
-		return OPKG_OPK_ERROR;
-	}
-
-	return OPKG_OPK_OK;
-}
-
-static void
-_opkg_opk_opk_read_free_inner(struct opkg_opk_opk *opk)
-{
-	opkg_opk_ustar_free(opk->inner_ustar);
-	opkg_opk_gzip_free(opk->inner_gzip);
-}
-
-static int
-_opkg_opk_opk_read_check_name(const char *member_name,
-		struct _opkg_opk_opk_seek_name **head,
-		struct _opkg_opk_opk_seek_name **tail)
-{
-	struct _opkg_opk_opk_seek_name *seek_name;
-
-	if (member_name[0] == '.' && member_name[1] == '/') {
-		member_name += 2;
-	} else if (member_name[0] == '/') {
-		member_name += 1;
-	}
-
-	/* Check each requested name. */
-	for (seek_name = *head; seek_name != NULL; seek_name = seek_name->next)
-	{
-		if (strcmp(member_name, seek_name->name) == 0) {
-			if (seek_name->prev != NULL) {
-				seek_name->prev->next = seek_name->next;
-			} else {
-				/* This was the head.  Update. */
-				*head = seek_name->next;
-			}
-			if (seek_name->next != NULL) {
-				seek_name->next->prev = seek_name->prev;
-			} else {
-				/* This was the tail.  Update. */
-				*tail = seek_name->prev;
-			}
-			free(seek_name);
-			return OPKG_OPK_OK;
-		}
-	}
-
-	return OPKG_OPK_ERROR;  /* Member not found */
-}
-
-static int
-_opkg_opk_opk_read_control(struct opkg_opk_opk *opk)
-{
-	struct stat                     stat_buf;
-	char                           *path;
-	struct opkg_opk_ustar_member   *member;
-	int                             ret_list;
-	FILE                           *fp;
-	int                             print;
-	int                             ret_read;
-	char                           *buffer;
-	size_t                          size;
-	struct _opkg_opk_opk_seek_name *seek_name;
-
-	if (opk->control_dir != NULL) {
-		if (stat(opk->control_dir, &stat_buf) == 0) {
-			if (!S_ISDIR(stat_buf.st_mode)) {
-				fputs(_("Error: Cannot create control directory"
-							"\n"), stderr);
-				return OPKG_OPK_ERROR;
-			}
-		} else if (mkdir(opk->control_dir, 0755) != 0) {
-			fputs(_("Error: Cannot create control directory"
-						"\n"), stderr);
-			return OPKG_OPK_ERROR;
-		}
-/*		For below #pragmas: path initialized here
- *		(opk->control_dir != NULL). */
-		path = malloc(strlen(opk->control_dir) +
-				OPKG_OPK_USTAR_NAME_SIZE + 1);
-		if (path == NULL) {
-			return OPKG_OPK_ERROR;
-		}
-	} else if (opk->list_control == 0 && opk->print_control_head == NULL) {
-		/* Not listing or printing any control files. */
-		return OPKG_OPK_OK;
-	}
-
-	if (_opkg_opk_opk_read_init_inner(opk) != OPKG_OPK_OK) {
-		if (opk->control_dir != NULL) {
-#			pragma GCC diagnostic push
-#			pragma GCC diagnostic ignored \
-				"-Wanalyzer-use-of-uninitialized-value"
-			free(path);
-#			pragma GCC diagnostic pop
-		}
-		return OPKG_OPK_ERROR;
-	}
-
-	while ((ret_list = opkg_opk_ustar_list(opk->inner_ustar, &member)) ==
-			OPKG_OPK_OK) {
-		/* Remove leading "./" if present and skip if nothing's left. */
-		buffer = member->name;
-		if (buffer[0] == '.' && buffer[1] == '/') {
-			buffer += 2;
-		}
-		if (buffer[0] == '\0') {
-			free(member);
-			continue;
-		}
-
-		/* Only extract and/or print regular files. */
-		if (member->type != '-') {
-			fputs(_("Error: Non-regular control files not supported"
-						"\n"), stderr);
-			free(member);
-			_opkg_opk_opk_read_free_inner(opk);
-			if (opk->control_dir != NULL) {
-#				pragma GCC diagnostic push
-#				pragma GCC diagnostic ignored \
-					"-Wanalyzer-use-of-uninitialized-value"
-				free(path);
-#				pragma GCC diagnostic pop
-			}
-			return OPKG_OPK_ERROR;
-		}
-
-		/* Open file for extraction. */
-		if (opk->control_dir != NULL) {
-#			pragma GCC diagnostic push
-#			pragma GCC diagnostic ignored \
-				"-Wanalyzer-use-of-uninitialized-value"
-			if (sprintf(path, "%s/%s", opk->control_dir,
-						member->name) <= 0) {
-				free(member);
-				_opkg_opk_opk_read_free_inner(opk);
-				free(path);
-				return OPKG_OPK_ERROR;
-#				pragma GCC diagnostic pop
-			}
-#			pragma GCC diagnostic push
-#			pragma GCC diagnostic ignored \
-				"-Wmaybe-uninitialized"
-/*			For below #pragmas: fp initialized here
- *			(opk->control_dir != NULL). */
-/*			GCC analyzer doesn't complain about this use of path? */
-			fp = fopen(path, "wb");
-#			pragma GCC diagnostic pop
-			if (fp == NULL) {
-				fputs(_("Error: Failed to extract control file"
-							"\n"), stderr);
-				free(member);
-				_opkg_opk_opk_read_free_inner(opk);
-#				pragma GCC diagnostic push
-#				pragma GCC diagnostic ignored \
-					"-Wanalyzer-use-of-uninitialized-value"
-				free(path);
-#				pragma GCC diagnostic pop
-				return OPKG_OPK_ERROR;
-			}
-		}
-
-		/* List file. */
-		if (opk->list_control > 0) {
-			puts(buffer);
-			opk->previously_printed = 1;
-		}
-
-		/* Print file if requested. */
-		if (opk->print_control_head != NULL &&
-				_opkg_opk_opk_read_check_name(member->name,
-					&opk->print_control_head,
-					&opk->print_control_tail) ==
-				OPKG_OPK_OK) {
-			/* Name requested for printing. */
-			print = 1;
-		} else {
-			print = 0;
-		}
-		free(member);
-		if (print == 1 && opk->previously_printed == 1) {
-			puts("");
-		}
-		while ((ret_read = opkg_opk_ustar_read(opk->inner_ustar,
-						&buffer, &size)) == OPKG_OPK_OK)
-		{
-			if (print == 1 && fwrite(buffer, 1, size, stdout) !=
-					size) {
-				fputs(_("Error: Failed to print control file\n")
-						, stderr);
-				_opkg_opk_opk_read_free_inner(opk);
-				if (opk->control_dir != NULL) {
-					free(path);
-				}
-				return OPKG_OPK_ERROR;
-			}
-#			pragma GCC diagnostic push
-#			pragma GCC diagnostic ignored \
-				"-Wanalyzer-use-of-uninitialized-value"
-			if (opk->control_dir != NULL && fwrite(buffer, 1, size,
-						fp) != size) {
-				fputs(_("Error: Failed to write control file\n")
-						, stderr);
-				_opkg_opk_opk_read_free_inner(opk);
-				free(path);
-#				pragma GCC diagnostic pop
-				return OPKG_OPK_ERROR;
-			}
-		}
-		if (ret_read == OPKG_OPK_ERROR) {
-			fputs(_("Error: Failed to read control file\n"),
-					stderr);
-			_opkg_opk_opk_read_free_inner(opk);
-			if (opk->control_dir != NULL) {
-#				pragma GCC diagnostic push
-#				pragma GCC diagnostic ignored \
-					"-Wanalyzer-use-of-uninitialized-value"
-#				pragma GCC diagnostic ignored \
-					"-Wmaybe-uninitialized"
-				free(path);
-				fclose(fp);
-#				pragma GCC diagnostic pop
-			}
-#			pragma GCC diagnostic push
-#			pragma GCC diagnostic ignored "-Wanalyzer-file-leak"
-			return OPKG_OPK_ERROR;
-#			pragma GCC diagnostic pop
-		}
-		opk->previously_printed = 1;
-
-		/* Close file for extraction. */
-		if (opk->control_dir != NULL) {
-#			pragma GCC diagnostic push
-#			pragma GCC diagnostic ignored \
-				"-Wanalyzer-use-of-uninitialized-value"
-			if (fclose(fp) != 0) {
-				_opkg_opk_opk_read_free_inner(opk);
-				free(path);
-#				pragma GCC diagnostic pop
-				return OPKG_OPK_ERROR;
-			}
-		}
-	}
-	if (opk->control_dir != NULL) {
-		/* Done with path buffer. */
-#		pragma GCC diagnostic push
-#		pragma GCC diagnostic ignored \
-			"-Wanalyzer-use-of-uninitialized-value"
-		free(path);
-#		pragma GCC diagnostic pop
-	}
-	if (ret_list == OPKG_OPK_ERROR) {
-		fputs(_("Error: Failed to list control files\n"), stderr);
-		_opkg_opk_opk_read_free_inner(opk);
-		return OPKG_OPK_ERROR;
-	}
-
-	/* Check for files not found. */
-	if (opk->print_control_head != NULL) {
-		for (seek_name = opk->print_control_head; seek_name != NULL;
-				seek_name = seek_name->next) {
-			fprintf(stderr, _("Error: Failed to find control file "
-						"\"%s\"\n"), seek_name->name);
-		}
-		_opkg_opk_opk_read_free_inner(opk);
-		return OPKG_OPK_ERROR;
-	}
-
-	_opkg_opk_opk_read_free_inner(opk);
-
-	return OPKG_OPK_OK;
-}
-
-static int
-_opkg_opk_opk_read_data(struct opkg_opk_opk *opk)
-{
-	struct opkg_opk_ustar_member *head;
-	struct opkg_opk_ustar_member *tail;
-	struct opkg_opk_ustar_member *member;
-	int                           ret;
-	size_t                        uname_len;
-	size_t                        uname_len_max;
-	size_t                        gname_len;
-	size_t                        gname_len_max;
-	uint64_t                      size_max;
-	uint32_t                      devmajor_max;
-	uint32_t                      devminor_max;
-	int                           ret_read;
-	char                         *buffer;
-	size_t                        size;
-	long int                      size_len_max;
-	long int                      devmajor_len_max;
-	long int                      devminor_len_max;
-	long int                      dev_len_max;
-	char                          fmt[26];
-	                              /* "%c%s %-32s/%-32s %16d %s " */
-	char                          fmt_dev[30];
-	                              /* "%c%s %-32s/%-32s %9d, %7d %s " */
-	int                           len;
-	char                          mode[10];
-	char                          mtime[20];
-
-	if (opk->list_data == 0 && opk->print_data_head == NULL) {
-		/* Not listing or printing any data files. */
-		return OPKG_OPK_OK;
-	}
-
-	if (_opkg_opk_opk_read_init_inner(opk) != OPKG_OPK_OK) {
-		return OPKG_OPK_ERROR;
-	}
-
-	/* Build singly-linked list and find maximum column widths. */
-	head = NULL;
-	tail = NULL;
-	uname_len_max = 0;
-	gname_len_max = 0;
-	size_max      = 0;
-	devmajor_max  = 0;
-	devminor_max  = 0;
-	while ((ret = opkg_opk_ustar_list(opk->inner_ustar, &member)) ==
-			OPKG_OPK_OK) {
-		/* If listing, link members and update max column widths. */
-		if (opk->list_data > 0) {
-			if (head == NULL) {
-				head = member;
-			} else {
-				tail->next = member;
-			}
-			tail = member;
-			uname_len = strlen(member->uname);
-			if (uname_len > uname_len_max) {
-				uname_len_max = uname_len;
-			}
-			gname_len = strlen(member->gname);
-			if (gname_len > gname_len_max) {
-				gname_len_max = gname_len;
-			}
-			if (member->size > size_max) {
-				size_max = member->size;
-			}
-			if (member->devmajor > devmajor_max) {
-				devmajor_max = member->devmajor;
-			}
-			if (member->devminor > devminor_max) {
-				devminor_max = member->devminor;
-			}
-		}
-
-		if (opk->print_data_head == NULL) {
-			if (opk->list_data == 0) {
-				free(member);
-			}
-			continue;
-		}
-		if (_opkg_opk_opk_read_check_name(member->name,
-					&opk->print_data_head,
-					&opk->print_data_tail) !=
-				OPKG_OPK_OK) {
-			/* Name not requested for printing. */
-			if (opk->list_data == 0) {
-				free(member);
-			}
-			continue;
-		}
-		if (opk->list_data == 0) {
-			free(member);
-		}
-		if (opk->previously_printed == 1) {
-			puts("");
-		}
-		while ((ret_read = opkg_opk_ustar_read(opk->inner_ustar,
-						&buffer, &size)) == OPKG_OPK_OK)
-		{
-			if (fwrite(buffer, 1, size, stdout) != size) {
-				fputs(_("Error: Failed to print data file\n")
-						, stderr);
-				_opkg_opk_opk_read_free_inner(opk);
-				return OPKG_OPK_ERROR;
-			}
-		}
-		if (ret_read == OPKG_OPK_ERROR) {
-			fputs(_("Error: Failed to read data file\n"),
-					stderr);
-			_opkg_opk_opk_read_free_inner(opk);
-			return OPKG_OPK_ERROR;
-		}
-		opk->previously_printed = 1;
-	}
-	if (ret == OPKG_OPK_ERROR) {
-		fputs(_("Error: Failed to list data files\n"), stderr);
-		_opkg_opk_opk_read_free_inner(opk);
-		return OPKG_OPK_ERROR;
-	}
-	if (tail != NULL) {
-		tail->next = NULL;
-	}
-
-	if (opk->list_data == 0) {
-		_opkg_opk_opk_read_free_inner(opk);
-		return OPKG_OPK_OK;
-	}
-
-	/* Print and free members. */
-	if (opk->previously_printed == 1) {
-		puts("");
-	}
-	ret = OPKG_OPK_OK;
-	size_len_max     = lrint(ceil(log10(    size_max)));
-	devmajor_len_max = lrint(ceil(log10(devmajor_max)));
-	devminor_len_max = lrint(ceil(log10(devminor_max)));
-	if (devmajor_len_max == 0) {
-		devmajor_len_max = 1;
-	}
-	if (devminor_len_max == 0) {
-		devminor_len_max = 1;
-	}
-	dev_len_max = devmajor_len_max + 2 /* ", " */ + devminor_len_max;
-	if (dev_len_max > size_len_max) {
-		size_len_max = dev_len_max;
-	}
-	snprintf(fmt    , sizeof(fmt    ), "%%c%%s %%-%zus/%%-%zus %%%lid %%s ",
-			uname_len_max, gname_len_max, size_len_max);
-	snprintf(fmt_dev, sizeof(fmt_dev), "%%c%%s %%-%zus/%%-%zus "
-			"%%%lid, %%%lid %%s ",
-			uname_len_max, gname_len_max,
-			size_len_max - devminor_len_max - 2, devminor_len_max);
-	len = 34 + uname_len_max + gname_len_max + size_len_max;
-	for (member = head; member != NULL;) {
-		if (member->mode & 00400) mode[0] = 'r'; else mode[0] = '-';
-		if (member->mode & 00200) mode[1] = 'w'; else mode[1] = '-';
-		if (member->mode & 00100) mode[2] = 'x'; else mode[2] = '-';
-		if (member->mode & 04000) mode[2] = 's';
-		if (member->mode & 00040) mode[3] = 'r'; else mode[3] = '-';
-		if (member->mode & 00020) mode[4] = 'w'; else mode[4] = '-';
-		if (member->mode & 00010) mode[5] = 'x'; else mode[5] = '-';
-		if (member->mode & 02000) mode[5] = 's';
-		if (member->mode & 00004) mode[6] = 'r'; else mode[6] = '-';
-		if (member->mode & 00002) mode[7] = 'w'; else mode[7] = '-';
-		if (member->mode & 00001) mode[8] = 'x'; else mode[8] = '-';
-		if (member->mode & 01000) mode[8] = 't';
-		mode[9] = '\0';
-		strftime(mtime, sizeof(mtime), "%Y-%m-%d %H:%M:%S",
-				localtime((const time_t *) &member->mtime));
-#		pragma GCC diagnostic push
-#		pragma GCC diagnostic ignored "-Wformat-nonliteral"
-		if (member->type != 'b' && member->type != 'c') {
-			if (printf(fmt, member->type, mode,
-					member->uname, member->gname,
-					member->size, mtime) != len) {
-				ret = OPKG_OPK_ERROR;
-			}
-		} else {
-			if (printf(fmt_dev, member->type, mode,
-					member->uname, member->gname,
-					member->devmajor, member->devminor,
-					mtime) != len) {
-				ret = OPKG_OPK_ERROR;
-			}
-		}
-#		pragma GCC diagnostic pop
-		/* Print name, ensuring it begins with "/". */
-		if (member->name[0] == '.' && member->name[1] == '/') {
-			if (fputs(member->name + 1, stdout) == EOF) {
-				ret = OPKG_OPK_ERROR;
-			}
-		} else {
-			if (member->name[0] != '/' && putchar('/') == EOF) {
-				ret = OPKG_OPK_ERROR;
-			}
-			if (fputs(member->name, stdout) == EOF) {
-				ret = OPKG_OPK_ERROR;
-			}
-		}
-		/* Print link name, if any. */
-		if (member->type == 'l' && printf(" -> %s", member->linkname) !=
-				(int) (strlen(member->linkname) + 4)) {
-			ret = OPKG_OPK_ERROR;
-		}
-		if (puts("") == EOF) {
-			ret = OPKG_OPK_ERROR;
-		}
-		head   = member;
-		member = member->next;
-		free(head);
-	}
-
-	opk->previously_printed = 1;
-
-	_opkg_opk_opk_read_free_inner(opk);
-
-	return ret;
-}
-
-int
-opkg_opk_opk_read(struct opkg_opk_opk *opk, const char *file_name)
-{
-	int                           ret;
-	struct opkg_opk_ustar_member *member;
-	char                         *version_buffer;
-	size_t                        version_size;
-
-	ret = OPKG_OPK_OK;
-
-	/* Open outer archive. */
-	opk->file = fopen(file_name, "rb");
-	if (opk->file == NULL) {
-		fprintf(stderr, _("Error: Failed to open file \"%s\"\n"),
-				file_name);
-		ret = OPKG_OPK_ERROR;
-		goto out0;
-	}
-
-	/* Initialize outer gzip decompressor. */
-	opk->outer_gzip = opkg_opk_gzip_init_read(&_opkg_opk_opk_read_file,
-			opk);
-	if (opk->outer_gzip == NULL) {
-		fputs(_("Error: Failed to initialize\n"), stderr);
-		ret = OPKG_OPK_ERROR;
-		goto out1;
-	}
-
-	/* Initialize outer ustar unarchiver. */
-	opk->outer_ustar = opkg_opk_ustar_init(opk->outer_gzip);
-	if (opk->outer_ustar == NULL) {
-		fputs(_("Error: Failed to initialize\n"), stderr);
-		ret = OPKG_OPK_ERROR;
-		goto out2;
-	}
-
-	/* Check package version. */
-	if (opkg_opk_ustar_list(opk->outer_ustar, &member) != OPKG_OPK_OK) {
-		fputs(_("Error: Failed to find \"debian-binary\" in archive\n"),
-				stderr);
-		ret = OPKG_OPK_ERROR;
-		goto out3;
-	}
-	if (strcmp(member->name, "debian-binary") != 0) {
-		free(member);
-		fputs(_("Error: Failed to find \"debian-binary\" in archive\n"),
-				stderr);
-		ret = OPKG_OPK_ERROR;
-		goto out3;
-	}
-	free(member);
-	if (opkg_opk_ustar_read(opk->outer_ustar,
-				&version_buffer, &version_size) !=
-			OPKG_OPK_OK) {
-		fputs(_("Error: Failed to read \"debian-binary\" in archive\n"),
-				stderr);
-		ret = OPKG_OPK_ERROR;
-		goto out3;
-	}
-	if (version_size < 4 || strncmp(version_buffer, "2.", 2) != 0) {
-		fputs(_("Error: Unsupported package version\n"), stderr);
-		ret = OPKG_OPK_ERROR;
-		goto out3;
-	}
-
-	/* Read control archive. */
-	if (opkg_opk_ustar_list(opk->outer_ustar, &member) != OPKG_OPK_OK) {
-		fputs(_("Error: Failed to find \"control.tar.gz\" in archive\n")
-				, stderr);
-		return OPKG_OPK_ERROR;
-	}
-	if (strcmp(member->name, "control.tar.gz") != 0) {
-		free(member);
-		fputs(_("Error: Failed to find \"control.tar.gz\" in archive\n")
-				, stderr);
-		return OPKG_OPK_ERROR;
-	}
-	free(member);
-	if (_opkg_opk_opk_read_control(opk) != OPKG_OPK_OK) {
-		ret = OPKG_OPK_ERROR;
-		goto out3;
-	}
-
-	/* Read data archive. */
-	if (opkg_opk_ustar_list(opk->outer_ustar, &member) != OPKG_OPK_OK) {
-		fputs(_("Error: Failed to find \"data.tar.gz\" in archive\n"),
-				stderr);
-		return OPKG_OPK_ERROR;
-	}
-	if (strcmp(member->name, "data.tar.gz") != 0) {
-		free(member);
-		fputs(_("Error: Failed to find \"data.tar.gz\" in archive\n"),
-				stderr);
-		return OPKG_OPK_ERROR;
-	}
-	free(member);
-	if (_opkg_opk_opk_read_data(opk) != OPKG_OPK_OK) {
-		ret = OPKG_OPK_ERROR;
-		goto out3;
-	}
-
- out3:
-	opkg_opk_ustar_free(opk->outer_ustar);
- out2:
-	opkg_opk_gzip_free(opk->outer_gzip);
- out1:
-	fclose(opk->file);
- out0:
-	return ret;
-}
diff --git a/src/opk/write.c b/src/opk/write.c
deleted file mode 100644
index 284b625..0000000
--- a/src/opk/write.c
+++ /dev/null
@@ -1,551 +0,0 @@
-/*
- * Copyright (C) 2023  Patrick McDermott
- *
- * This file is part of opkg-opk.
- *
- * opkg-opk is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * opkg-opk is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with opkg-opk.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-#include <dirent.h>
-#include <grp.h>
-#include <pwd.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/stat.h>
-#include <sys/sysmacros.h>
-#include <unistd.h>
-#include "../defs.h"
-#include "../dirent.h"
-#include "../gzip.h"
-#include "../i18n.h"
-#include "../opk.h"
-#include "../specials.h"
-#include "../ustar.h"
-#include "opk.h"
-
-enum _opkg_opk_opk_archive_type {
-	OPKG_OPK_OPK_ARCHIVE_TYPE_CONTROL_ = 0,
-	OPKG_OPK_OPK_ARCHIVE_TYPE_DATA_ = 1,
-};
-static const char *OPKG_OPK_OPK_ARCHIVE_NAMES_[]  = {
-	"control.tar.gz",
-	"data.tar.gz",
-};
-
-static int
-_opkg_opk_opk_source_date_epoch(uint64_t *mtime)
-{
-	char *env;
-	char *end;
-
-	env = getenv("SOURCE_DATE_EPOCH");
-	if (env == NULL) {
-		return OPKG_OPK_ERROR;
-	}
-	*mtime = strtol(env, &end, 10);
-	if (*end != '\0') {
-		return OPKG_OPK_ERROR;
-	}
-	return OPKG_OPK_OK;
-}
-
-static int
-_opkg_opk_opk_write_filter(const struct dirent *de)
-{
-	if (de->d_name[0] == '.') {
-		if (de->d_name[1] == '\0') {
-			return 0;
-		}
-		if (de->d_name[1] == '.' && de->d_name[2] == '\0') {
-			return 0;
-		}
-	}
-	return 1;
-}
-
-static int
-_opkg_opk_opk_write_compar(const struct dirent **a, const struct dirent **b)
-{
-	return strcmp((*a)->d_name, (*b)->d_name);
-}
-
-static int
-_opkg_opk_opk_write_dir_read(struct opkg_opk_opk *opk,
-		struct opkg_opk_dirent *dir, size_t path_off)
-{
-	char                    *child_path;
-	int                      children_n;
-	struct dirent          **children;
-	int                      children_i;
-	struct opkg_opk_dirent   child;
-	size_t                   name_i;
-	struct stat              st;
-	uid_t                    uid;
-	char                    *uname;
-	gid_t                    gid;
-	char                    *gname;
-	                         /* Extra byte (in macro definition) to detect
-	                          * overflow, not for NUL */
-	char                     link[OPKG_OPK_USTAR_LINKNAME_SIZE];
-	ssize_t                  link_len;
-	char                     type;
-	uint32_t                 devmajor;
-	uint32_t                 devminor;
-	FILE                    *fp;
-	char                    *buffer;
-	size_t                   size;
-	size_t                   num_read;
-	size_t                   tot_read;
-	int                      ret;
-
-	child_path = opk->path_virt + path_off;
-	children_n = scandir(opk->path_real, &children, _opkg_opk_opk_write_filter,
-			_opkg_opk_opk_write_compar);
-	for (children_i = 0; children_i < children_n; ++children_i) {
-		child.name = children[children_i]->d_name;
-		child.parent = dir;
-		for (name_i = 0; children[children_i]->d_name[name_i] != '\0';
-				++name_i) {
-			if (path_off + name_i + 1 == OPKG_OPK_USTAR_NAME_SIZE) {
-				fprintf(stderr, "Error: File name \"%s\" too "
-						"long",
-						children[children_i]->d_name);
-				goto err;
-			}
-			child_path[name_i] =
-				children[children_i]->d_name[name_i];
-		}
-		child_path[name_i] = '\0';
-		if (lstat(opk->path_real, &st) != 0) {
-			fprintf(stderr, _("Error: Failed to stat \"%s\"\n"),
-					opk->path_real);
-			goto err;
-		}
-		/* TODO: Ownership override */
-		uid = st.st_uid;
-		uname = getpwuid(uid)->pw_name;
-		gid = st.st_gid;
-		gname = getgrgid(gid)->gr_name;
-		if (S_ISDIR(st.st_mode)) {
-			if (path_off + name_i + 2 == OPKG_OPK_USTAR_NAME_SIZE) {
-				fprintf(stderr, "Error: File name \"%s\" too "
-						"long", child_path);
-				goto err;
-			}
-			child_path[name_i] = '/';
-			child_path[++name_i] = '\0';
-			if (opkg_opk_ustar_write_header(opk->inner_ustar,
-						&child, st.st_mode & 0777,
-						uid, uname, gid, gname, 0, 0, 0,
-						opk->mtime, 'd', NULL) !=
-					OPKG_OPK_OK) {
-				fputs(_("Error: Failed to write header\n"),
-						stderr);
-				goto err;
-			}
-			if (_opkg_opk_opk_write_dir_read(opk, &child,
-						path_off + name_i) !=
-					OPKG_OPK_OK) {
-				goto err;
-			}
-		} else if (S_ISLNK(st.st_mode)) {
-			link_len = readlink(opk->path_real, link,
-					OPKG_OPK_USTAR_LINKNAME_SIZE);
-			if (link_len < 0) {
-				goto err;
-			}
-			if (link_len == OPKG_OPK_USTAR_LINKNAME_SIZE) {
-				goto err;
-			}
-			link[link_len] = '\0';
-			if (opkg_opk_ustar_write_header(opk->inner_ustar,
-						&child, 0777,
-						uid, uname, gid, gname, 0, 0, 0,
-						opk->mtime, 'l', link) !=
-					OPKG_OPK_OK) {
-				fputs(_("Error: Failed to write header\n"),
-						stderr);
-				goto err;
-			}
-		} else if (S_ISCHR(st.st_mode)) {
-			if (opkg_opk_ustar_write_header(opk->inner_ustar,
-						&child, st.st_mode & 0777,
-						uid, uname, gid, gname,
-						major(st.st_rdev),
-						minor(st.st_rdev),
-						0, opk->mtime, 'c', NULL) !=
-					OPKG_OPK_OK) {
-				fputs(_("Error: Failed to write header\n"),
-						stderr);
-				goto err;
-			}
-		} else if (S_ISBLK(st.st_mode)) {
-			if (opkg_opk_ustar_write_header(opk->inner_ustar,
-						&child, st.st_mode & 0777,
-						uid, uname, gid, gname,
-						major(st.st_rdev),
-						minor(st.st_rdev),
-						0, opk->mtime, 'b', NULL) !=
-					OPKG_OPK_OK) {
-				fputs(_("Error: Failed to write header\n"),
-						stderr);
-				goto err;
-			}
-		} else if (S_ISFIFO(st.st_mode)) {
-			if (opkg_opk_ustar_write_header(opk->inner_ustar,
-						&child, st.st_mode & 0777,
-						uid, uname, gid, gname, 0, 0, 0,
-						opk->mtime, 'p', NULL) !=
-					OPKG_OPK_OK) {
-				fputs(_("Error: Failed to write header\n"),
-						stderr);
-				goto err;
-			}
-		} else if (S_ISREG(st.st_mode)) {
-			if (opkg_opk_specials_find(opk->specials,
-						opk->path_virt, &type,
-						&devmajor, &devminor) ==
-					OPKG_OPK_OK) {
-				if (opkg_opk_ustar_write_header(
-							opk->inner_ustar,
-							&child,
-							st.st_mode & 0777,
-							uid, uname, gid, gname,
-							devmajor, devminor, 0,
-							opk->mtime, type, NULL)
-						!= OPKG_OPK_OK) {
-					fputs(_("Error: Failed to write header"
-								"\n"), stderr);
-					goto err;
-				}
-				continue;
-			}
-			if (opkg_opk_ustar_write_header(opk->inner_ustar,
-						&child, st.st_mode & 0777,
-						uid, uname, gid, gname, 0, 0,
-						st.st_size, opk->mtime, '-',
-						NULL) != OPKG_OPK_OK) {
-				fputs(_("Error: Failed to write header\n"),
-						stderr);
-				goto err;
-			}
-			fp = fopen(opk->path_real, "rb");
-			if (fp == NULL) {
-				fprintf(stderr, _("Error: Failed to open file "
-							"\"%s\"\n"),
-						opk->path_real);
-				goto err;
-			}
-			opkg_opk_ustar_get_buffer(opk->inner_ustar,
-					&buffer, &size);
-			tot_read = 0;
-			while ((num_read = fread(buffer, 1, size, fp)) > 0) {
-				opkg_opk_ustar_write_data(opk->inner_ustar,
-						num_read);
-				tot_read += num_read;
-			}
-			if (ferror(fp) != 0) {
-				fputs(_("Error: Error reading file\n"), stderr);
-				fclose(fp);
-				goto err;
-			}
-			if (fclose(fp) != 0) {
-				fputs(_("Error: Failed to close file\n"),
-						stderr);
-				goto err;
-			}
-			if ((uintmax_t) tot_read != (uintmax_t) st.st_size) {
-				fprintf(stderr, _("Error: Expected %jd bytes "
-							"but read %zu\n"),
-							(intmax_t) st.st_size,
-							num_read);
-				goto err;
-			}
-		} else {
-			fprintf(stderr, _("Error: Unknown type of file \"%s\"\n"
-						), opk->path_real);
-			goto err;
-		}
-	}
-
-	ret = OPKG_OPK_OK;
-	goto out;
- err:
-	ret = OPKG_OPK_ERROR;
- out:
-	for (children_i = 0; children_i < children_n; ++children_i) {
-		free(children[children_i]);
-	}
-	free(children);
-	return ret;
-}
-
-static int
-_opkg_opk_opk_build_inner_archive(struct opkg_opk_opk *opk,
-		enum _opkg_opk_opk_archive_type archive_type)
-{
-	FILE                   *fp;
-	struct opkg_opk_dirent  dirent;
-	struct stat             st;
-	uid_t                   uid;
-	char                   *uname;
-	gid_t                   gid;
-	char                    *gname;
-	size_t                  written;
-	char                   *buffer;
-	size_t                  size;
-	size_t                  num_read;
-	size_t                  tot_read;
-
-	/* Initialize inner gzip compressor. */
-	if (sprintf(opk->temp_file_name, "%s~%s", opk->file_name,
-				OPKG_OPK_OPK_ARCHIVE_NAMES_[archive_type]) <= 0)
-	{
-		goto err0;
-	}
-	fp = fopen(opk->temp_file_name, "w+b");
-	if (fp == NULL) {
-		fprintf(stderr, _("Error: Failed to open file \"%s\"\n"),
-				opk->temp_file_name);
-		goto err0;
-	}
-	opk->inner_gzip = opkg_opk_gzip_init_write(fp);
-	if (opk->inner_gzip == NULL) {
-		fputs(_("Error: Failed to initialize compressor\n"), stderr);
-		goto err1;
-	}
-
-	/* Initialize inner ustar archiver. */
-	opk->inner_ustar = opkg_opk_ustar_init(opk->inner_gzip);
-	if (opk->inner_ustar == NULL) {
-		fputs(_("Error: Failed to initialize archiver\n"), stderr);
-		goto err2;
-	}
-
-	/* Write inner archive to temporary file. */
-	dirent.name   = ".";
-	dirent.parent = NULL;
-	if (archive_type == OPKG_OPK_OPK_ARCHIVE_TYPE_CONTROL_) {
-		sprintf(opk->path_real, "%s/", opk->control_dir);
-		opk->path_virt = opk->path_real + opk->control_dir_len;
-	} else {
-		sprintf(opk->path_real, "%s/", opk->data_dir);
-		opk->path_virt = opk->path_real + opk->data_dir_len;
-	}
-	if (stat(opk->path_real, &st) != 0) {
-		fprintf(stderr, _("Error: Failed to stat \"%s\"\n"),
-				opk->path_real);
-		goto err3;
-	}
-	uid = st.st_uid;
-	uname = getpwuid(uid)->pw_name;
-	gid = st.st_gid;
-	gname = getgrgid(gid)->gr_name;
-	if (opkg_opk_ustar_write_header(opk->inner_ustar, &dirent,
-				st.st_mode & 0777, uid, uname, gid, gname, 0,
-				0, 0, opk->mtime, 'd', NULL) != OPKG_OPK_OK) {
-		fputs(_("Error: Failed to write header\n"),
-				stderr);
-		goto err3;
-	}
-	if (_opkg_opk_opk_write_dir_read(opk, &dirent, 1 /* Skip '/' */) !=
-			OPKG_OPK_OK) {
-		goto err3;
-	}
-
-	/* Write trailer. */
-	if (opkg_opk_ustar_write_trailer(opk->inner_ustar) != OPKG_OPK_OK) {
-		fputs(_("Error: Failed to write trailer\n"), stderr);
-		goto err3;
-	}
-
-	/* Finish inner archive. */
-	opkg_opk_ustar_free(opk->inner_ustar);
-	opkg_opk_gzip_finish_write(opk->inner_gzip);
-	written = opkg_opk_gzip_written(opk->inner_gzip);
-	opkg_opk_gzip_free(opk->inner_gzip);
-
-	/* Write header in outer archive. */
-	dirent.name   = OPKG_OPK_OPK_ARCHIVE_NAMES_[archive_type];
-	dirent.parent = NULL;
-	if (opkg_opk_ustar_write_header(opk->outer_ustar, &dirent, 0644,
-				0, opk->outer_uname, 0, opk->outer_gname, 0, 0,
-				written, opk->mtime, '-', NULL) !=
-			OPKG_OPK_OK) {
-		fputs(_("Error: Failed to write header\n"), stderr);
-		goto err1;
-	}
-
-	/* Read temporary file into outer archive. */
-	if (fseek(fp, 0L, SEEK_SET) != 0) {
-		fputs(_("Error: Failed to seek in file\n"), stderr);
-		goto err1;
-	}
-	opkg_opk_ustar_get_buffer(opk->outer_ustar, &buffer, &size);
-	tot_read = 0;
-	while ((num_read = fread(buffer, 1, size, fp)) > 0) {
-		opkg_opk_ustar_write_data(opk->outer_ustar, num_read);
-		tot_read += num_read;
-	}
-	if (ferror(fp) != 0) {
-		fputs(_("Error: Error reading file\n"), stderr);
-		fclose(fp);
-		goto err1;
-	}
-	if (fclose(fp) != 0) {
-		fputs(_("Error: Failed to close file\n"), stderr);
-		goto err1;
-	}
-	unlink(opk->temp_file_name);
-	if (tot_read != written) {
-		fprintf(stderr, _("Error: Wrote %lu bytes but read %lu\n"),
-					written, num_read);
-		goto err1;
-	}
-
-	return OPKG_OPK_OK;
-
- err3:
-	opkg_opk_ustar_free(opk->inner_ustar);
- err2:
-	opkg_opk_gzip_free(opk->inner_gzip);
- err1:
-	fclose(fp);
- err0:
-	return OPKG_OPK_ERROR;
-}
-
-int
-opkg_opk_opk_write(struct opkg_opk_opk *opk, const char *file_name)
-{
-	int                     ret;
-	struct opkg_opk_dirent  dirent;
-	char                   *buffer;
-	size_t                  size;
-	size_t                  path_len;
-
-	ret = OPKG_OPK_OK;
-
-	if (_opkg_opk_opk_source_date_epoch(&opk->mtime) == OPKG_OPK_ERROR) {
-		fputs(_("Error: Missing or invalid SOURCE_DATE_EPOCH\n"),
-				stderr);
-		ret = OPKG_OPK_ERROR;
-		goto out0;
-	}
-
-	opk->file_name = file_name;
-
-	/* Open outer archive. */
-	opk->file = fopen(file_name, "wb");
-	if (opk->file == NULL) {
-		fprintf(stderr, _("Error: Failed to open file \"%s\"\n"),
-				file_name);
-		ret = OPKG_OPK_ERROR;
-		goto out0;
-	}
-
-	/* Initialize outer gzip compressor. */
-	opk->outer_gzip = opkg_opk_gzip_init_write(opk->file);
-	if (opk->outer_gzip == NULL) {
-		fputs(_("Error: Failed to initialize\n"), stderr);
-		ret = OPKG_OPK_ERROR;
-		goto out1;
-	}
-
-	/* Initialize outer ustar archiver. */
-	opk->outer_ustar = opkg_opk_ustar_init(opk->outer_gzip);
-	if (opk->outer_ustar == NULL) {
-		fputs(_("Error: Failed to initialize\n"), stderr);
-		ret = OPKG_OPK_ERROR;
-		goto out2;
-	}
-
-	opk->outer_uname = getpwuid(0)->pw_name;
-	opk->outer_gname = getgrgid(0)->gr_name;
-
-	/* Write version file. */
-	dirent.name   = "debian-binary";
-	dirent.parent = NULL;
-	if (opkg_opk_ustar_write_header(opk->outer_ustar, &dirent, 0644,
-				0, opk->outer_uname, 0, opk->outer_gname, 0, 0,
-				4, opk->mtime, '-', NULL) != OPKG_OPK_OK) {
-		fputs(_("Error: Failed to write header\n"), stderr);
-		ret = OPKG_OPK_ERROR;
-		goto out3;
-	}
-	opkg_opk_ustar_get_buffer(opk->outer_ustar, &buffer, &size);
-	memcpy(buffer, "2.0\n", 4);
-	if (opkg_opk_ustar_write_data(opk->outer_ustar, 4) != OPKG_OPK_OK) {
-		fputs(_("Error: Failed to write data\n"), stderr);
-		ret = OPKG_OPK_ERROR;
-		goto out3;
-	}
-
-	/* Allocate control and data file path buffer. */
-	if (opk->control_dir_len >= opk->data_dir_len) {
-		path_len = opk->control_dir_len;
-	} else {
-		path_len = opk->data_dir_len;
-	}
-	path_len += 1 /* '/' */ + OPKG_OPK_USTAR_NAME_SIZE;
-	opk->path_real = malloc(path_len);
-	if (opk->path_real == NULL) {
-		ret = OPKG_OPK_ERROR;
-		goto out3;
-	}
-
-	/* Allocate temporary archive file name buffer. */
-	opk->temp_file_name =
-		malloc(strlen(file_name) + strlen("~control.tar.gz") + 1);
-	if (opk->temp_file_name == NULL) {
-		ret = OPKG_OPK_ERROR;
-		goto out4;
-	}
-
-	if (_opkg_opk_opk_build_inner_archive(opk,
-				OPKG_OPK_OPK_ARCHIVE_TYPE_CONTROL_) !=
-			OPKG_OPK_OK) {
-		ret = OPKG_OPK_ERROR;
-		goto out5;
-	}
-	if (_opkg_opk_opk_build_inner_archive(opk,
-				OPKG_OPK_OPK_ARCHIVE_TYPE_DATA_) !=
-			OPKG_OPK_OK) {
-		ret = OPKG_OPK_ERROR;
-		goto out5;
-	}
-
-	/* Write trailer. */
-	if (opkg_opk_ustar_write_trailer(opk->outer_ustar) != OPKG_OPK_OK) {
-		fputs(_("Error: Failed to write trailer\n"), stderr);
-		ret = OPKG_OPK_ERROR;
-		goto out5;
-	}
-
- out5:
-	free(opk->temp_file_name);
- out4:
-	free(opk->path_real);
- out3:
-	opkg_opk_ustar_free(opk->outer_ustar);
- out2:
-	opkg_opk_gzip_finish_write(opk->outer_gzip);
-	opkg_opk_gzip_free(opk->outer_gzip);
- out1:
-	fclose(opk->file);
- out0:
-	return ret;
-}