From e14ffcf8e092758bc21d0d5c795b58ea0b1773f2 Mon Sep 17 00:00:00 2001 From: David Oberhollenzer Date: Wed, 21 Aug 2019 12:23:01 +0200 Subject: Merge functionality of file on disk and file in sqfs compare functions Moving towards unified sqfs vs sqfs, sqfs vs dir, dir vs sqfs comparisions. Signed-off-by: David Oberhollenzer --- difftool/extract.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'difftool/extract.c') diff --git a/difftool/extract.c b/difftool/extract.c index 9d84265..9fee46d 100644 --- a/difftool/extract.c +++ b/difftool/extract.c @@ -39,12 +39,12 @@ static int extract(data_reader_t *data, file_info_t *fi, int extract_files(file_info_t *a, file_info_t *b, const char *path) { - if (a != NULL) { + if (a != NULL && !a_is_dir) { if (extract(sqfs_a.data, a, path, 'a')) return -1; } - if (b != NULL) { + if (b != NULL && !b_is_dir) { if (extract(sqfs_b.data, b, path, 'b')) return -1; } -- cgit v1.2.3