Cleanup directory structure of the binary programs

Instead of having the binary programs in randomly named subdirectories,
move all of them to a "bin" subdirectory, similar to the utility
libraries that have subdirectories within "lib" and give the
subdirectories the propper names (e.g. have gensquashfs source in a
directory *actually* named "gensquashfs").

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

1 files changed, 0 insertions, 216 deletions

diff --git a/mkfs/mkfs.c b/mkfs/mkfs.c
deleted file mode 100644
index 9ffbb94..0000000
--- a/mkfs/mkfs.c
+++ /dev/null
@@ -1,216 +0,0 @@
-/* SPDX-License-Identifier: GPL-3.0-or-later */
-/*
- * mkfs.c
- *
- * Copyright (C) 2019 David Oberhollenzer <goliath@infraroot.at>
- */
-#include "mkfs.h"
-
-static int set_working_dir(options_t *opt)
-{
-	const char *ptr;
-	char *path;
-
-	if (opt->packdir != NULL) {
-		if (chdir(opt->packdir)) {
-			perror(opt->packdir);
-			return -1;
-		}
-		return 0;
-	}
-
-	ptr = strrchr(opt->infile, '/');
-	if (ptr == NULL)
-		return 0;
-
-	path = strndup(opt->infile, ptr - opt->infile);
-	if (path == NULL) {
-		perror("constructing input directory path");
-		return -1;
-	}
-
-	if (chdir(path)) {
-		perror(path);
-		free(path);
-		return -1;
-	}
-
-	free(path);
-	return 0;
-}
-
-static int pack_files(sqfs_block_processor_t *data, fstree_t *fs,
-		      options_t *opt)
-{
-	sqfs_inode_generic_t **inode_ptr;
-	sqfs_u64 filesize;
-	sqfs_file_t *file;
-	tree_node_t *node;
-	const char *path;
-	char *node_path;
-	file_info_t *fi;
-	int flags;
-	int ret;
-
-	if (set_working_dir(opt))
-		return -1;
-
-	for (fi = fs->files; fi != NULL; fi = fi->next) {
-		if (fi->input_file == NULL) {
-			node = container_of(fi, tree_node_t, data.file);
-
-			node_path = fstree_get_path(node);
-			if (node_path == NULL) {
-				perror("reconstructing file path");
-				return -1;
-			}
-
-			ret = canonicalize_name(node_path);
-			assert(ret == 0);
-
-			path = node_path;
-		} else {
-			node_path = NULL;
-			path = fi->input_file;
-		}
-
-		if (!opt->cfg.quiet)
-			printf("packing %s\n", path);
-
-		file = sqfs_open_file(path, SQFS_FILE_OPEN_READ_ONLY);
-		if (file == NULL) {
-			perror(path);
-			free(node_path);
-			return -1;
-		}
-
-		flags = 0;
-		filesize = file->get_size(file);
-
-		if (opt->no_tail_packing && filesize > opt->cfg.block_size)
-			flags |= SQFS_BLK_DONT_FRAGMENT;
-
-		inode_ptr = (sqfs_inode_generic_t **)&fi->user_ptr;
-
-		ret = write_data_from_file(path, data, inode_ptr, file, flags);
-		sqfs_destroy(file);
-		free(node_path);
-
-		if (ret)
-			return -1;
-	}
-
-	return 0;
-}
-
-static int relabel_tree_dfs(const char *filename, sqfs_xattr_writer_t *xwr,
-			    tree_node_t *n, void *selinux_handle)
-{
-	char *path = fstree_get_path(n);
-	int ret;
-
-	if (path == NULL) {
-		perror("getting absolute node path for SELinux relabeling");
-		return -1;
-	}
-
-	ret = sqfs_xattr_writer_begin(xwr);
-	if (ret) {
-		sqfs_perror(filename, "recording xattr key-value pairs", ret);
-		return -1;
-	}
-
-	if (selinux_relable_node(selinux_handle, xwr, n, path)) {
-		free(path);
-		return -1;
-	}
-
-	ret = sqfs_xattr_writer_end(xwr, &n->xattr_idx);
-	if (ret) {
-		sqfs_perror(filename, "flushing completed key-value pairs",
-			    ret);
-		return -1;
-	}
-
-	free(path);
-
-	if (S_ISDIR(n->mode)) {
-		for (n = n->data.dir.children; n != NULL; n = n->next) {
-			if (relabel_tree_dfs(filename, xwr, n, selinux_handle))
-				return -1;
-		}
-	}
-
-	return 0;
-}
-
-static int read_fstree(fstree_t *fs, options_t *opt, sqfs_xattr_writer_t *xwr,
-		       void *selinux_handle)
-{
-	FILE *fp;
-	int ret;
-
-	if (opt->infile == NULL) {
-		return fstree_from_dir(fs, opt->packdir, selinux_handle,
-				       xwr, opt->dirscan_flags);
-	}
-
-	fp = fopen(opt->infile, "rb");
-	if (fp == NULL) {
-		perror(opt->infile);
-		return -1;
-	}
-
-	ret = fstree_from_file(fs, opt->infile, fp);
-	fclose(fp);
-
-	if (ret == 0 && selinux_handle != NULL)
-		ret = relabel_tree_dfs(opt->cfg.filename, xwr,
-				       fs->root, selinux_handle);
-
-	return ret;
-}
-
-int main(int argc, char **argv)
-{
-	int status = EXIT_FAILURE;
-	void *sehnd = NULL;
-	sqfs_writer_t sqfs;
-	options_t opt;
-
-	process_command_line(&opt, argc, argv);
-
-	if (sqfs_writer_init(&sqfs, &opt.cfg))
-		return EXIT_FAILURE;
-
-	if (opt.selinux != NULL) {
-		sehnd = selinux_open_context_file(opt.selinux);
-		if (sehnd == NULL)
-			goto out;
-	}
-
-	if (read_fstree(&sqfs.fs, &opt, sqfs.xwr, sehnd)) {
-		if (sehnd != NULL)
-			selinux_close_context_file(sehnd);
-		goto out;
-	}
-
-	if (sehnd != NULL) {
-		selinux_close_context_file(sehnd);
-		sehnd = NULL;
-	}
-
-	if (fstree_post_process(&sqfs.fs))
-		goto out;
-
-	if (pack_files(sqfs.data, &sqfs.fs, &opt))
-		goto out;
-
-	if (sqfs_writer_finish(&sqfs, &opt.cfg))
-		goto out;
-
-	status = EXIT_SUCCESS;
-out:
-	sqfs_writer_cleanup(&sqfs, status);
-	return status;
-}