summaryrefslogtreecommitdiff
path: root/bin/sqfsdiff/compare_dir.c
diff options
context:
space:
mode:
authorDavid Oberhollenzer <david.oberhollenzer@sigma-star.at>2020-04-27 11:59:02 +0200
committerDavid Oberhollenzer <david.oberhollenzer@sigma-star.at>2020-04-27 11:59:02 +0200
commit20b0d509f67dea802706cd6b80b5e20d14988931 (patch)
tree3a87ea358b1206f6823777693d109896d6908283 /bin/sqfsdiff/compare_dir.c
parent9e332a2d3eddcc262476ac263e03df021b3c44b4 (diff)
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>
Diffstat (limited to 'bin/sqfsdiff/compare_dir.c')
-rw-r--r--bin/sqfsdiff/compare_dir.c94
1 files changed, 94 insertions, 0 deletions
diff --git a/bin/sqfsdiff/compare_dir.c b/bin/sqfsdiff/compare_dir.c
new file mode 100644
index 0000000..1a4c800
--- /dev/null
+++ b/bin/sqfsdiff/compare_dir.c
@@ -0,0 +1,94 @@
+/* SPDX-License-Identifier: GPL-3.0-or-later */
+/*
+ * compare_dir.c
+ *
+ * Copyright (C) 2019 David Oberhollenzer <goliath@infraroot.at>
+ */
+#include "sqfsdiff.h"
+
+static int print_omitted(sqfsdiff_t *sd, bool is_old, sqfs_tree_node_t *n)
+{
+ char *path = node_path(n);
+
+ if (path == NULL)
+ return -1;
+
+ fprintf(stdout, "%c %s\n", is_old ? '<' : '>', path);
+
+ if ((sd->compare_flags & COMPARE_EXTRACT_FILES) &&
+ S_ISREG(n->inode->base.mode)) {
+ if (extract_files(sd, is_old ? n->inode : NULL,
+ is_old ? NULL : n->inode, path)) {
+ free(path);
+ return -1;
+ }
+ }
+
+ free(path);
+
+ for (n = n->children; n != NULL; n = n->next) {
+ if (print_omitted(sd, is_old, n))
+ return -1;
+ }
+
+ return 0;
+}
+
+int compare_dir_entries(sqfsdiff_t *sd, sqfs_tree_node_t *old,
+ sqfs_tree_node_t *new)
+{
+ sqfs_tree_node_t *old_it = old->children, *old_prev = NULL;
+ sqfs_tree_node_t *new_it = new->children, *new_prev = NULL;
+ int ret, result = 0;
+
+ while (old_it != NULL || new_it != NULL) {
+ if (old_it != NULL && new_it != NULL) {
+ ret = strcmp((const char *)old_it->name,
+ (const char *)new_it->name);
+ } else if (old_it == NULL) {
+ ret = 1;
+ } else {
+ ret = -1;
+ }
+
+ if (ret < 0) {
+ result = 1;
+
+ if (print_omitted(sd, true, old_it))
+ return -1;
+
+ if (old_prev == NULL) {
+ old->children = old_it->next;
+ sqfs_dir_tree_destroy(old_it);
+ old_it = old->children;
+ } else {
+ old_prev->next = old_it->next;
+ sqfs_dir_tree_destroy(old_it);
+ old_it = old_prev->next;
+ }
+ } else if (ret > 0) {
+ result = 1;
+
+ if (print_omitted(sd, false, new_it))
+ return -1;
+
+ if (new_prev == NULL) {
+ new->children = new_it->next;
+ sqfs_dir_tree_destroy(new_it);
+ new_it = new->children;
+ } else {
+ new_prev->next = new_it->next;
+ sqfs_dir_tree_destroy(new_it);
+ new_it = new_prev->next;
+ }
+ } else {
+ old_prev = old_it;
+ old_it = old_it->next;
+
+ new_prev = new_it;
+ new_it = new_it->next;
+ }
+ }
+
+ return result;
+}