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

diff --git a/difftool/node_compare.c b/difftool/node_compare.c
deleted file mode 100644
index 59d1831..0000000
--- a/difftool/node_compare.c
+++ /dev/null
@@ -1,203 +0,0 @@
-/* SPDX-License-Identifier: GPL-3.0-or-later */
-/*
- * node_compare.c
- *
- * Copyright (C) 2019 David Oberhollenzer <goliath@infraroot.at>
- */
-#include "sqfsdiff.h"
-
-int node_compare(sqfsdiff_t *sd, sqfs_tree_node_t *a, sqfs_tree_node_t *b)
-{
-	char *path = sqfs_tree_node_get_path(a);
-	sqfs_tree_node_t *ait, *bit;
-	bool promoted, demoted;
-	int ret, status = 0;
-
-	if (path == NULL) {
-		perror("constructing absolute file path");
-		return -1;
-	}
-
-	if (a->inode->base.type != b->inode->base.type) {
-		promoted = demoted = false;
-
-		switch (a->inode->base.type) {
-		case SQFS_INODE_DIR:
-			if (b->inode->base.type == SQFS_INODE_EXT_DIR)
-				promoted = true;
-			break;
-		case SQFS_INODE_FILE:
-			if (b->inode->base.type == SQFS_INODE_EXT_FILE)
-				promoted = true;
-			break;
-		case SQFS_INODE_SLINK:
-			if (b->inode->base.type == SQFS_INODE_EXT_SLINK)
-				promoted = true;
-			break;
-		case SQFS_INODE_BDEV:
-			if (b->inode->base.type == SQFS_INODE_EXT_BDEV)
-				promoted = true;
-			break;
-		case SQFS_INODE_CDEV:
-			if (b->inode->base.type == SQFS_INODE_EXT_CDEV)
-				promoted = true;
-			break;
-		case SQFS_INODE_FIFO:
-			if (b->inode->base.type == SQFS_INODE_EXT_FIFO)
-				promoted = true;
-			break;
-		case SQFS_INODE_SOCKET:
-			if (b->inode->base.type == SQFS_INODE_EXT_SOCKET)
-				promoted = true;
-			break;
-		case SQFS_INODE_EXT_DIR:
-			if (b->inode->base.type == SQFS_INODE_DIR)
-				demoted = true;
-			break;
-		case SQFS_INODE_EXT_FILE:
-			if (b->inode->base.type == SQFS_INODE_FILE)
-				demoted = true;
-			break;
-		case SQFS_INODE_EXT_SLINK:
-			if (b->inode->base.type == SQFS_INODE_SLINK)
-				demoted = true;
-			break;
-		case SQFS_INODE_EXT_BDEV:
-			if (b->inode->base.type == SQFS_INODE_BDEV)
-				demoted = true;
-			break;
-		case SQFS_INODE_EXT_CDEV:
-			if (b->inode->base.type == SQFS_INODE_CDEV)
-				demoted = true;
-			break;
-		case SQFS_INODE_EXT_FIFO:
-			if (b->inode->base.type == SQFS_INODE_FIFO)
-				demoted = true;
-			break;
-		case SQFS_INODE_EXT_SOCKET:
-			if (b->inode->base.type == SQFS_INODE_SOCKET)
-				demoted = true;
-			break;
-		}
-
-		if (promoted) {
-			fprintf(stdout, "%s has an extended type\n", path);
-			status = 1;
-		} else if (demoted) {
-			fprintf(stdout, "%s has a basic type\n", path);
-			status = 1;
-		} else {
-			fprintf(stdout, "%s has a different type\n", path);
-			free(path);
-			return 1;
-		}
-	}
-
-	if (!(sd->compare_flags & COMPARE_NO_PERM)) {
-		if ((a->inode->base.mode & ~S_IFMT) !=
-		    (b->inode->base.mode & ~S_IFMT)) {
-			fprintf(stdout, "%s has different permissions\n",
-				path);
-			status = 1;
-		}
-	}
-
-	if (!(sd->compare_flags & COMPARE_NO_OWNER)) {
-		if (a->uid != b->uid || a->gid != b->gid) {
-			fprintf(stdout, "%s has different ownership\n", path);
-			status = 1;
-		}
-	}
-
-	if (sd->compare_flags & COMPARE_TIMESTAMP) {
-		if (a->inode->base.mod_time != b->inode->base.mod_time) {
-			fprintf(stdout, "%s has a different timestamp\n", path);
-			status = 1;
-		}
-	}
-
-	if (sd->compare_flags & COMPARE_INODE_NUM) {
-		if (a->inode->base.inode_number !=
-		    b->inode->base.inode_number) {
-			fprintf(stdout, "%s has a different inode number\n",
-				path);
-			status = 1;
-		}
-	}
-
-	switch (a->inode->base.type) {
-	case SQFS_INODE_SOCKET:
-	case SQFS_INODE_EXT_SOCKET:
-	case SQFS_INODE_FIFO:
-	case SQFS_INODE_EXT_FIFO:
-		break;
-	case SQFS_INODE_BDEV:
-	case SQFS_INODE_CDEV:
-		if (a->inode->data.dev.devno != b->inode->data.dev.devno) {
-			fprintf(stdout, "%s has different device number\n",
-				path);
-			status = 1;
-		}
-		break;
-	case SQFS_INODE_EXT_BDEV:
-	case SQFS_INODE_EXT_CDEV:
-		if (a->inode->data.dev_ext.devno !=
-		    b->inode->data.dev_ext.devno) {
-			fprintf(stdout, "%s has different device number\n",
-				path);
-			status = 1;
-		}
-		break;
-	case SQFS_INODE_SLINK:
-	case SQFS_INODE_EXT_SLINK:
-		if (strcmp((const char *)a->inode->extra,
-			   (const char *)b->inode->extra)) {
-			fprintf(stdout, "%s has a different link target\n",
-				path);
-		}
-		break;
-	case SQFS_INODE_DIR:
-	case SQFS_INODE_EXT_DIR:
-		ret = compare_dir_entries(sd, a, b);
-		if (ret < 0) {
-			status = -1;
-			break;
-		}
-		if (ret > 0)
-			status = 1;
-
-		free(path);
-		path = NULL;
-
-		ait = a->children;
-		bit = b->children;
-
-		while (ait != NULL && bit != NULL) {
-			ret = node_compare(sd, ait, bit);
-			if (ret < 0)
-				return -1;
-			if (ret > 0)
-				status = 1;
-
-			ait = ait->next;
-			bit = bit->next;
-		}
-		break;
-	case SQFS_INODE_FILE:
-	case SQFS_INODE_EXT_FILE:
-		ret = compare_files(sd, a->inode, b->inode, path);
-		if (ret < 0) {
-			status = -1;
-		} else if (ret > 0) {
-			fprintf(stdout, "regular file %s differs\n", path);
-			status = 1;
-		}
-		break;
-	default:
-		fprintf(stdout, "%s has unknown type, ignoring\n", path);
-		break;
-	}
-
-	free(path);
-	return status;
-}