summaryrefslogtreecommitdiff
path: root/difftool/sqfsdiff.c
diff options
context:
space:
mode:
authorDavid Oberhollenzer <david.oberhollenzer@sigma-star.at>2019-08-21 14:04:43 +0200
committerDavid Oberhollenzer <david.oberhollenzer@sigma-star.at>2019-08-21 14:04:43 +0200
commit4ff2b4f689f4e530b6c6f3eed17a595f7ccf56fb (patch)
tree1e453c616d34a1547eb8e62949337e8361c6b31e /difftool/sqfsdiff.c
parent5cbc1267e5dc42149eeb07883f5f6239d22388e9 (diff)
Isolate sqfsdiff global state and split off option processing
Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
Diffstat (limited to 'difftool/sqfsdiff.c')
-rw-r--r--difftool/sqfsdiff.c162
1 files changed, 16 insertions, 146 deletions
diff --git a/difftool/sqfsdiff.c b/difftool/sqfsdiff.c
index ddc2686..2bc733b 100644
--- a/difftool/sqfsdiff.c
+++ b/difftool/sqfsdiff.c
@@ -6,172 +6,42 @@
*/
#include "sqfsdiff.h"
-static struct option long_opts[] = {
- { "old", required_argument, NULL, 'a' },
- { "new", required_argument, NULL, 'b' },
- { "no-owner", no_argument, NULL, 'O' },
- { "no-permissions", no_argument, NULL, 'P' },
- { "no-contents", no_argument, NULL, 'C' },
- { "timestamps", no_argument, NULL, 'T' },
- { "inode-num", no_argument, NULL, 'I' },
- { "super", no_argument, NULL, 'S' },
- { "extract", required_argument, NULL, 'e' },
- { "help", no_argument, NULL, 'h' },
- { "version", no_argument, NULL, 'V' },
-};
-
-static const char *short_opts = "a:b:OPCTISe:hV";
-
-static const char *usagestr =
-"Usage: sqfsdiff [OPTIONS...] --old,-a <first> --new,-b <second>\n"
-"\n"
-"Compare two squashfs images. In contrast to doing a direct diff of the\n"
-"images, this actually parses the filesystems and generates a more\n"
-"meaningful difference report.\n"
-"\n"
-"If only contents are compared, any differences in packed file layout,\n"
-"ordering, compression, inode allocation and so on is ignored and the two\n"
-"images are considered equal if each directory contains the same entries,\n"
-"symlink with the same paths have the same targets, device nodes the same\n"
-"device number and files the same size and contents.\n"
-"\n"
-"A report of any difference is printed to stdout. The exit status is similar\n"
-"that of diff(1): 0 means equal, 1 means different, 2 means problem.\n"
-"\n"
-"Possible options:\n"
-"\n"
-" --old, -a <first> The first of the two images to compare.\n"
-" --new, -b <second> The second of the two images to compare.\n"
-"\n"
-" --no-contents, -C Do not compare file contents.\n"
-" --no-owner, -O Do not compare file owners.\n"
-" --no-permissions, -P Do not compare permission bits.\n"
-"\n"
-" --timestamps, -T Compare file timestamps.\n"
-" --inode-num, -I Compare inode numbers of all files.\n"
-" --super, -S Also compare metadata in super blocks.\n"
-"\n"
-" --extract, -e <path> Extract files that differ to the specified\n"
-" directory. Contents of the first image end up\n"
-" in a subdirectory 'a' and of the second image\n"
-" in a subdirectory 'b'.\n"
-"\n"
-" --help, -h Print help text and exit.\n"
-" --version, -V Print version information and exit.\n"
-"\n";
-
-int compare_flags = 0;
-const char *old_path;
-const char *new_path;
-sqfs_reader_t sqfs_old;
-sqfs_reader_t sqfs_new;
-bool old_is_dir;
-bool new_is_dir;
-static bool compare_super = false;
-static const char *extract_dir;
-
-static void process_options(int argc, char **argv)
-{
- int i;
-
- for (;;) {
- i = getopt_long(argc, argv, short_opts, long_opts, NULL);
- if (i == -1)
- break;
-
- switch (i) {
- case 'a':
- old_path = optarg;
- break;
- case 'b':
- new_path = optarg;
- break;
- case 'O':
- compare_flags |= COMPARE_NO_OWNER;
- break;
- case 'P':
- compare_flags |= COMPARE_NO_PERM;
- break;
- case 'C':
- compare_flags |= COMPARE_NO_CONTENTS;
- break;
- case 'T':
- compare_flags |= COMPARE_TIMESTAMP;
- break;
- case 'I':
- compare_flags |= COMPARE_INODE_NUM;
- break;
- case 'S':
- compare_super = true;
- break;
- case 'e':
- compare_flags |= COMPARE_EXTRACT_FILES;
- extract_dir = optarg;
- break;
- case 'h':
- fputs(usagestr, stdout);
- exit(EXIT_SUCCESS);
- case 'V':
- print_version();
- exit(EXIT_SUCCESS);
- default:
- goto fail_arg;
- }
- }
-
- if (old_path == NULL) {
- fputs("Missing arguments: first filesystem\n", stderr);
- goto fail_arg;
- }
-
- if (new_path == NULL) {
- fputs("Missing arguments: second filesystem\n", stderr);
- goto fail_arg;
- }
-
- if (optind < argc) {
- fputs("Unknown extra arguments\n", stderr);
- goto fail_arg;
- }
- return;
-fail_arg:
- fprintf(stderr, "Try `sqfsdiff --help' for more information.\n");
- exit(EXIT_FAILURE);
-}
-
int main(int argc, char **argv)
{
int status, ret = 0;
+ sqfsdiff_t sd;
- process_options(argc, argv);
+ memset(&sd, 0, sizeof(sd));
+ process_options(&sd, argc, argv);
- if (extract_dir != NULL) {
- if (mkdir_p(extract_dir))
+ if (sd.extract_dir != NULL) {
+ if (mkdir_p(sd.extract_dir))
return EXIT_FAILURE;
}
- if (sqfs_reader_open(&sqfs_old, old_path, 0))
+ if (sqfs_reader_open(&sd.sqfs_old, sd.old_path, 0))
return 2;
- if (sqfs_reader_open(&sqfs_new, new_path, 0)) {
+ if (sqfs_reader_open(&sd.sqfs_new, sd.new_path, 0)) {
status = 2;
goto out_sqfs_old;
}
- if (extract_dir != NULL) {
- if (chdir(extract_dir)) {
- perror(extract_dir);
+ if (sd.extract_dir != NULL) {
+ if (chdir(sd.extract_dir)) {
+ perror(sd.extract_dir);
ret = -1;
goto out;
}
}
- ret = node_compare(sqfs_old.fs.root, sqfs_new.fs.root);
+ ret = node_compare(&sd, sd.sqfs_old.fs.root, sd.sqfs_new.fs.root);
if (ret != 0)
goto out;
- if (compare_super) {
- ret = compare_super_blocks(&sqfs_old.super, &sqfs_new.super);
+ if (sd.compare_super) {
+ ret = compare_super_blocks(&sd.sqfs_old.super,
+ &sd.sqfs_new.super);
if (ret != 0)
goto out;
}
@@ -183,8 +53,8 @@ out:
} else {
status = 0;
}
- sqfs_reader_close(&sqfs_new);
+ sqfs_reader_close(&sd.sqfs_new);
out_sqfs_old:
- sqfs_reader_close(&sqfs_old);
+ sqfs_reader_close(&sd.sqfs_old);
return status;
}