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, 125 deletions

diff --git a/unpack/describe.c b/unpack/describe.c
deleted file mode 100644
index d30f844..0000000
--- a/unpack/describe.c
+++ /dev/null
@@ -1,125 +0,0 @@
-/* SPDX-License-Identifier: GPL-3.0-or-later */
-/*
- * describe.c
- *
- * Copyright (C) 2019 David Oberhollenzer <goliath@infraroot.at>
- */
-#include "rdsquashfs.h"
-
-static int print_name(const sqfs_tree_node_t *n)
-{
-	char *start, *ptr, *name = sqfs_tree_node_get_path(n);
-	int ret;
-
-	if (name == NULL) {
-		perror("Recovering file path of tree node");
-		return -1;
-	}
-
-	ret = canonicalize_name(name);
-	assert(ret == 0);
-
-	if (strchr(name, ' ') == NULL && strchr(name, '"') == NULL) {
-		fputs(name, stdout);
-	} else {
-		fputc('"', stdout);
-
-		ptr = strchr(name, '"');
-
-		if (ptr != NULL) {
-			start = name;
-
-			do {
-				fwrite(start, 1, ptr - start, stdout);
-				fputs("\\\"", stdout);
-				start = ptr + 1;
-				ptr = strchr(start, '"');
-			} while (ptr != NULL);
-
-			fputs(start, stdout);
-		} else {
-			fputs(name, stdout);
-		}
-
-		fputc('"', stdout);
-	}
-
-	free(name);
-	return 0;
-}
-
-static void print_perm(const sqfs_tree_node_t *n)
-{
-	printf(" 0%o %d %d", n->inode->base.mode & (~S_IFMT), n->uid, n->gid);
-}
-
-static int print_simple(const char *type, const sqfs_tree_node_t *n,
-			const char *extra)
-{
-	printf("%s ", type);
-	if (print_name(n))
-		return -1;
-	print_perm(n);
-	if (extra != NULL)
-		printf(" %s", extra);
-	fputc('\n', stdout);
-	return 0;
-}
-
-int describe_tree(const sqfs_tree_node_t *root, const char *unpack_root)
-{
-	const sqfs_tree_node_t *n;
-
-	switch (root->inode->base.mode & S_IFMT) {
-	case S_IFSOCK:
-		return print_simple("sock", root, NULL);
-	case S_IFLNK:
-		return print_simple("slink", root,
-				    (const char *)root->inode->extra);
-	case S_IFIFO:
-		return print_simple("pipe", root, NULL);
-	case S_IFREG:
-		if (unpack_root == NULL)
-			return print_simple("file", root, NULL);
-
-		fputs("file ", stdout);
-		if (print_name(root))
-			return -1;
-		print_perm(root);
-		printf(" %s/", unpack_root);
-		if (print_name(root))
-			return -1;
-		fputc('\n', stdout);
-		break;
-	case S_IFCHR:
-	case S_IFBLK: {
-		char buffer[32];
-		sqfs_u32 devno;
-
-		if (root->inode->base.type == SQFS_INODE_EXT_BDEV ||
-		    root->inode->base.type == SQFS_INODE_EXT_CDEV) {
-			devno = root->inode->data.dev_ext.devno;
-		} else {
-			devno = root->inode->data.dev.devno;
-		}
-
-		sprintf(buffer, "%c %d %d",
-			S_ISCHR(root->inode->base.mode) ? 'c' : 'b',
-			major(devno), minor(devno));
-		return print_simple("nod", root, buffer);
-	}
-	case S_IFDIR:
-		if (root->name[0] != '\0') {
-			if (print_simple("dir", root, NULL))
-				return -1;
-		}
-
-		for (n = root->children; n != NULL; n = n->next) {
-			if (describe_tree(n, unpack_root))
-				return -1;
-		}
-		break;
-	}
-
-	return 0;
-}